Detemplatize the Statistic class. The only type it is instantiated with
is 'unsigned'.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@32279 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/CodeGen/BranchFolding.cpp b/lib/CodeGen/BranchFolding.cpp
index 8ded3cd..0dfa492 100644
--- a/lib/CodeGen/BranchFolding.cpp
+++ b/lib/CodeGen/BranchFolding.cpp
@@ -30,9 +30,9 @@
#include <algorithm>
using namespace llvm;
-static Statistic<> NumDeadBlocks("branchfold", "Number of dead blocks removed");
-static Statistic<> NumBranchOpts("branchfold", "Number of branches optimized");
-static Statistic<> NumTailMerge ("branchfold", "Number of block tails merged");
+static Statistic NumDeadBlocks("branchfold", "Number of dead blocks removed");
+static Statistic NumBranchOpts("branchfold", "Number of branches optimized");
+static Statistic NumTailMerge ("branchfold", "Number of block tails merged");
static cl::opt<bool> EnableTailMerge("enable-tail-merge", cl::Hidden);
namespace {
diff --git a/lib/CodeGen/LiveIntervalAnalysis.cpp b/lib/CodeGen/LiveIntervalAnalysis.cpp
index 9248662..3bdbe85 100644
--- a/lib/CodeGen/LiveIntervalAnalysis.cpp
+++ b/lib/CodeGen/LiveIntervalAnalysis.cpp
@@ -39,19 +39,19 @@
namespace {
RegisterPass<LiveIntervals> X("liveintervals", "Live Interval Analysis");
- static Statistic<> numIntervals
+ static Statistic numIntervals
("liveintervals", "Number of original intervals");
- static Statistic<> numIntervalsAfter
+ static Statistic numIntervalsAfter
("liveintervals", "Number of intervals after coalescing");
- static Statistic<> numJoins
+ static Statistic numJoins
("liveintervals", "Number of interval joins performed");
- static Statistic<> numPeep
+ static Statistic numPeep
("liveintervals", "Number of identity moves eliminated after coalescing");
- static Statistic<> numFolded
+ static Statistic numFolded
("liveintervals", "Number of loads/stores folded into instructions");
static cl::opt<bool>
diff --git a/lib/CodeGen/PHIElimination.cpp b/lib/CodeGen/PHIElimination.cpp
index c107d1a..fec54ea 100644
--- a/lib/CodeGen/PHIElimination.cpp
+++ b/lib/CodeGen/PHIElimination.cpp
@@ -29,8 +29,8 @@
using namespace llvm;
namespace {
- static Statistic<> NumAtomic("phielim", "Number of atomic phis lowered");
- static Statistic<> NumSimple("phielim", "Number of simple phis lowered");
+ static Statistic NumAtomic("phielim", "Number of atomic phis lowered");
+ static Statistic NumSimple("phielim", "Number of simple phis lowered");
struct VISIBILITY_HIDDEN PNE : public MachineFunctionPass {
bool runOnMachineFunction(MachineFunction &Fn) {
diff --git a/lib/CodeGen/RegAllocLinearScan.cpp b/lib/CodeGen/RegAllocLinearScan.cpp
index 170febc..1977a54 100644
--- a/lib/CodeGen/RegAllocLinearScan.cpp
+++ b/lib/CodeGen/RegAllocLinearScan.cpp
@@ -37,9 +37,9 @@
namespace {
- static Statistic<> NumIters
+ static Statistic NumIters
("regalloc", "Number of iterations performed");
- static Statistic<> NumBacktracks
+ static Statistic NumBacktracks
("regalloc", "Number of times we had to backtrack");
static RegisterRegAlloc
diff --git a/lib/CodeGen/RegAllocLocal.cpp b/lib/CodeGen/RegAllocLocal.cpp
index 6090b4d..8d10ff7 100644
--- a/lib/CodeGen/RegAllocLocal.cpp
+++ b/lib/CodeGen/RegAllocLocal.cpp
@@ -33,9 +33,9 @@
using namespace llvm;
namespace {
- static Statistic<> NumStores("ra-local", "Number of stores added");
- static Statistic<> NumLoads ("ra-local", "Number of loads added");
- static Statistic<> NumFolded("ra-local", "Number of loads/stores folded "
+ static Statistic NumStores("ra-local", "Number of stores added");
+ static Statistic NumLoads ("ra-local", "Number of loads added");
+ static Statistic NumFolded("ra-local", "Number of loads/stores folded "
"into instructions");
static RegisterRegAlloc
diff --git a/lib/CodeGen/RegAllocSimple.cpp b/lib/CodeGen/RegAllocSimple.cpp
index f08b039..262f8c2 100644
--- a/lib/CodeGen/RegAllocSimple.cpp
+++ b/lib/CodeGen/RegAllocSimple.cpp
@@ -31,8 +31,8 @@
using namespace llvm;
namespace {
- static Statistic<> NumStores("ra-simple", "Number of stores added");
- static Statistic<> NumLoads ("ra-simple", "Number of loads added");
+ static Statistic NumStores("ra-simple", "Number of stores added");
+ static Statistic NumLoads ("ra-simple", "Number of loads added");
static RegisterRegAlloc
simpleRegAlloc("simple", " simple register allocator",
diff --git a/lib/CodeGen/SelectionDAG/DAGCombiner.cpp b/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
index 99de15c..2f8ad80 100644
--- a/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
+++ b/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
@@ -43,12 +43,12 @@
using namespace llvm;
namespace {
- static Statistic<> NodesCombined ("dagcombiner",
+ static Statistic NodesCombined ("dagcombiner",
"Number of dag nodes combined");
- static Statistic<> PreIndexedNodes ("pre_indexed_ops",
+ static Statistic PreIndexedNodes ("pre_indexed_ops",
"Number of pre-indexed nodes created");
- static Statistic<> PostIndexedNodes ("post_indexed_ops",
+ static Statistic PostIndexedNodes ("post_indexed_ops",
"Number of post-indexed nodes created");
static cl::opt<bool>
diff --git a/lib/CodeGen/SelectionDAG/ScheduleDAGList.cpp b/lib/CodeGen/SelectionDAG/ScheduleDAGList.cpp
index da8b1cd..2d08cba 100644
--- a/lib/CodeGen/SelectionDAG/ScheduleDAGList.cpp
+++ b/lib/CodeGen/SelectionDAG/ScheduleDAGList.cpp
@@ -36,8 +36,8 @@
using namespace llvm;
namespace {
- static Statistic<> NumNoops ("scheduler", "Number of noops inserted");
- static Statistic<> NumStalls("scheduler", "Number of pipeline stalls");
+ static Statistic NumNoops ("scheduler", "Number of noops inserted");
+ static Statistic NumStalls("scheduler", "Number of pipeline stalls");
}
static RegisterScheduler
diff --git a/lib/CodeGen/TwoAddressInstructionPass.cpp b/lib/CodeGen/TwoAddressInstructionPass.cpp
index 335a7e4..932542d 100644
--- a/lib/CodeGen/TwoAddressInstructionPass.cpp
+++ b/lib/CodeGen/TwoAddressInstructionPass.cpp
@@ -45,11 +45,11 @@
using namespace llvm;
namespace {
- static Statistic<> NumTwoAddressInstrs("twoaddressinstruction",
+ static Statistic NumTwoAddressInstrs("twoaddressinstruction",
"Number of two-address instructions");
- static Statistic<> NumCommuted("twoaddressinstruction",
+ static Statistic NumCommuted("twoaddressinstruction",
"Number of instructions commuted to coalesce");
- static Statistic<> NumConvertedTo3Addr("twoaddressinstruction",
+ static Statistic NumConvertedTo3Addr("twoaddressinstruction",
"Number of instructions promoted to 3-address");
struct VISIBILITY_HIDDEN TwoAddressInstructionPass
diff --git a/lib/CodeGen/VirtRegMap.cpp b/lib/CodeGen/VirtRegMap.cpp
index a795856..359294d 100644
--- a/lib/CodeGen/VirtRegMap.cpp
+++ b/lib/CodeGen/VirtRegMap.cpp
@@ -33,12 +33,12 @@
using namespace llvm;
namespace {
- static Statistic<> NumSpills("spiller", "Number of register spills");
- static Statistic<> NumStores("spiller", "Number of stores added");
- static Statistic<> NumLoads ("spiller", "Number of loads added");
- static Statistic<> NumReused("spiller", "Number of values reused");
- static Statistic<> NumDSE ("spiller", "Number of dead stores elided");
- static Statistic<> NumDCE ("spiller", "Number of copies elided");
+ static Statistic NumSpills("spiller", "Number of register spills");
+ static Statistic NumStores("spiller", "Number of stores added");
+ static Statistic NumLoads ("spiller", "Number of loads added");
+ static Statistic NumReused("spiller", "Number of values reused");
+ static Statistic NumDSE ("spiller", "Number of dead stores elided");
+ static Statistic NumDCE ("spiller", "Number of copies elided");
enum SpillerName { simple, local };