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/Analysis/DataStructure/BottomUpClosure.cpp b/lib/Analysis/DataStructure/BottomUpClosure.cpp
index 19b3ec1..f5ca5fd 100644
--- a/lib/Analysis/DataStructure/BottomUpClosure.cpp
+++ b/lib/Analysis/DataStructure/BottomUpClosure.cpp
@@ -26,9 +26,9 @@
using namespace llvm;
namespace {
- Statistic<> MaxSCC("budatastructure", "Maximum SCC Size in Call Graph");
- Statistic<> NumBUInlines("budatastructures", "Number of graphs inlined");
- Statistic<> NumCallEdges("budatastructures", "Number of 'actual' call edges");
+ Statistic MaxSCC("budatastructure", "Maximum SCC Size in Call Graph");
+ Statistic NumBUInlines("budatastructures", "Number of graphs inlined");
+ Statistic NumCallEdges("budatastructures", "Number of 'actual' call edges");
cl::opt<bool>
AddGlobals("budatastructures-annotate-calls", cl::Hidden,
diff --git a/lib/Analysis/DataStructure/CallTargets.cpp b/lib/Analysis/DataStructure/CallTargets.cpp
index 5850749..5ed4457 100644
--- a/lib/Analysis/DataStructure/CallTargets.cpp
+++ b/lib/Analysis/DataStructure/CallTargets.cpp
@@ -29,10 +29,10 @@
using namespace llvm;
namespace {
- Statistic<> DirCall("calltarget", "Number of direct calls");
- Statistic<> IndCall("calltarget", "Number of indirect calls");
- Statistic<> CompleteInd("calltarget", "Number of complete indirect calls");
- Statistic<> CompleteEmpty("calltarget", "Number of complete empty calls");
+ Statistic DirCall("calltarget", "Number of direct calls");
+ Statistic IndCall("calltarget", "Number of indirect calls");
+ Statistic CompleteInd("calltarget", "Number of complete indirect calls");
+ Statistic CompleteEmpty("calltarget", "Number of complete empty calls");
RegisterPass<CallTargetFinder> X("calltarget","Find Call Targets (uses DSA)");
}
diff --git a/lib/Analysis/DataStructure/CompleteBottomUp.cpp b/lib/Analysis/DataStructure/CompleteBottomUp.cpp
index aea113d..af33e0d 100644
--- a/lib/Analysis/DataStructure/CompleteBottomUp.cpp
+++ b/lib/Analysis/DataStructure/CompleteBottomUp.cpp
@@ -26,7 +26,7 @@
namespace {
RegisterPass<CompleteBUDataStructures>
X("cbudatastructure", "'Complete' Bottom-up Data Structure Analysis");
- Statistic<> NumCBUInlines("cbudatastructures", "Number of graphs inlined");
+ Statistic NumCBUInlines("cbudatastructures", "Number of graphs inlined");
}
diff --git a/lib/Analysis/DataStructure/DataStructure.cpp b/lib/Analysis/DataStructure/DataStructure.cpp
index 6eee541..80237c4 100644
--- a/lib/Analysis/DataStructure/DataStructure.cpp
+++ b/lib/Analysis/DataStructure/DataStructure.cpp
@@ -34,12 +34,12 @@
#define COLLAPSE_ARRAYS_AGGRESSIVELY 0
namespace {
- Statistic<> NumFolds ("dsa", "Number of nodes completely folded");
- Statistic<> NumCallNodesMerged("dsa", "Number of call nodes merged");
- Statistic<> NumNodeAllocated ("dsa", "Number of nodes allocated");
- Statistic<> NumDNE ("dsa", "Number of nodes removed by reachability");
- Statistic<> NumTrivialDNE ("dsa", "Number of nodes trivially removed");
- Statistic<> NumTrivialGlobalDNE("dsa", "Number of globals trivially removed");
+ Statistic NumFolds ("dsa", "Number of nodes completely folded");
+ Statistic NumCallNodesMerged("dsa", "Number of call nodes merged");
+ Statistic NumNodeAllocated ("dsa", "Number of nodes allocated");
+ Statistic NumDNE ("dsa", "Number of nodes removed by reachability");
+ Statistic NumTrivialDNE ("dsa", "Number of nodes trivially removed");
+ Statistic NumTrivialGlobalDNE("dsa", "Number of globals trivially removed");
static cl::opt<unsigned>
DSAFieldLimit("dsa-field-limit", cl::Hidden,
cl::desc("Number of fields to track before collapsing a node"),
diff --git a/lib/Analysis/DataStructure/DataStructureOpt.cpp b/lib/Analysis/DataStructure/DataStructureOpt.cpp
index 5674883..85da176 100644
--- a/lib/Analysis/DataStructure/DataStructureOpt.cpp
+++ b/lib/Analysis/DataStructure/DataStructureOpt.cpp
@@ -22,9 +22,9 @@
using namespace llvm;
namespace {
- Statistic<>
+ Statistic
NumGlobalsConstanted("ds-opt", "Number of globals marked constant");
- Statistic<>
+ Statistic
NumGlobalsIsolated("ds-opt", "Number of globals with references dropped");
class DSOpt : public ModulePass {
diff --git a/lib/Analysis/DataStructure/DataStructureStats.cpp b/lib/Analysis/DataStructure/DataStructureStats.cpp
index 469ab2e..f7fbe3b 100644
--- a/lib/Analysis/DataStructure/DataStructureStats.cpp
+++ b/lib/Analysis/DataStructure/DataStructureStats.cpp
@@ -23,19 +23,19 @@
using namespace llvm;
namespace {
- Statistic<> TotalNumCallees("totalcallees",
+ Statistic TotalNumCallees("totalcallees",
"Total number of callee functions at all indirect call sites");
- Statistic<> NumIndirectCalls("numindirect",
+ Statistic NumIndirectCalls("numindirect",
"Total number of indirect call sites in the program");
- Statistic<> NumPoolNodes("numpools",
+ Statistic NumPoolNodes("numpools",
"Number of allocation nodes that could be pool allocated");
// Typed/Untyped memory accesses: If DSA can infer that the types the loads
// and stores are accessing are correct (ie, the node has not been collapsed),
// increment the appropriate counter.
- Statistic<> NumTypedMemAccesses("numtypedmemaccesses",
+ Statistic NumTypedMemAccesses("numtypedmemaccesses",
"Number of loads/stores which are fully typed");
- Statistic<> NumUntypedMemAccesses("numuntypedmemaccesses",
+ Statistic NumUntypedMemAccesses("numuntypedmemaccesses",
"Number of loads/stores which are untyped");
class DSGraphStats : public FunctionPass, public InstVisitor<DSGraphStats> {
diff --git a/lib/Analysis/DataStructure/EquivClassGraphs.cpp b/lib/Analysis/DataStructure/EquivClassGraphs.cpp
index 38aaf0b..49c93ff 100644
--- a/lib/Analysis/DataStructure/EquivClassGraphs.cpp
+++ b/lib/Analysis/DataStructure/EquivClassGraphs.cpp
@@ -31,9 +31,9 @@
namespace {
RegisterPass<EquivClassGraphs> X("eqdatastructure",
"Equivalence-class Bottom-up Data Structure Analysis");
- Statistic<> NumEquivBUInlines("equivdatastructures",
+ Statistic NumEquivBUInlines("equivdatastructures",
"Number of graphs inlined");
- Statistic<> NumFoldGraphInlines("Inline equiv-class graphs bottom up",
+ Statistic NumFoldGraphInlines("Inline equiv-class graphs bottom up",
"Number of graphs inlined");
}
diff --git a/lib/Analysis/DataStructure/Printer.cpp b/lib/Analysis/DataStructure/Printer.cpp
index af358bf..2e86bda 100644
--- a/lib/Analysis/DataStructure/Printer.cpp
+++ b/lib/Analysis/DataStructure/Printer.cpp
@@ -33,8 +33,8 @@
namespace {
cl::opt<bool> OnlyPrintMain("only-print-main-ds", cl::ReallyHidden);
cl::opt<bool> DontPrintAnything("dont-print-ds", cl::ReallyHidden);
- Statistic<> MaxGraphSize ("dsa", "Maximum graph size");
- Statistic<> NumFoldedNodes ("dsa", "Number of folded nodes (in final graph)");
+ Statistic MaxGraphSize ("dsa", "Maximum graph size");
+ Statistic NumFoldedNodes ("dsa", "Number of folded nodes (in final graph)");
}
void DSNode::dump() const { print(llvm_cerr, 0); }
diff --git a/lib/Analysis/DataStructure/TopDownClosure.cpp b/lib/Analysis/DataStructure/TopDownClosure.cpp
index 57a8924..71bf271 100644
--- a/lib/Analysis/DataStructure/TopDownClosure.cpp
+++ b/lib/Analysis/DataStructure/TopDownClosure.cpp
@@ -34,7 +34,7 @@
RegisterPass<TDDataStructures> // Register the pass
Y("tddatastructure", "Top-down Data Structure Analysis");
- Statistic<> NumTDInlines("tddatastructures", "Number of graphs inlined");
+ Statistic NumTDInlines("tddatastructures", "Number of graphs inlined");
}
void TDDataStructures::markReachableFunctionsExternallyAccessible(DSNode *N,
diff --git a/lib/Analysis/IPA/Andersens.cpp b/lib/Analysis/IPA/Andersens.cpp
index 54e2944..2887503 100644
--- a/lib/Analysis/IPA/Andersens.cpp
+++ b/lib/Analysis/IPA/Andersens.cpp
@@ -65,15 +65,15 @@
using namespace llvm;
namespace {
- Statistic<>
+ Statistic
NumIters("anders-aa", "Number of iterations to reach convergence");
- Statistic<>
+ Statistic
NumConstraints("anders-aa", "Number of constraints");
- Statistic<>
+ Statistic
NumNodes("anders-aa", "Number of nodes");
- Statistic<>
+ Statistic
NumEscapingFunctions("anders-aa", "Number of internal functions that escape");
- Statistic<>
+ Statistic
NumIndirectCallees("anders-aa", "Number of indirect callees found");
class Andersens : public ModulePass, public AliasAnalysis,
diff --git a/lib/Analysis/IPA/GlobalsModRef.cpp b/lib/Analysis/IPA/GlobalsModRef.cpp
index 59cf66f..7ae5e5b 100644
--- a/lib/Analysis/IPA/GlobalsModRef.cpp
+++ b/lib/Analysis/IPA/GlobalsModRef.cpp
@@ -30,19 +30,19 @@
using namespace llvm;
namespace {
- Statistic<>
+ Statistic
NumNonAddrTakenGlobalVars("globalsmodref-aa",
"Number of global vars without address taken");
- Statistic<>
+ Statistic
NumNonAddrTakenFunctions("globalsmodref-aa",
"Number of functions without address taken");
- Statistic<>
+ Statistic
NumNoMemFunctions("globalsmodref-aa",
"Number of functions that do not access memory");
- Statistic<>
+ Statistic
NumReadMemFunctions("globalsmodref-aa",
"Number of functions that only read memory");
- Statistic<>
+ Statistic
NumIndirectGlobalVars("globalsmodref-aa",
"Number of indirect global objects");
diff --git a/lib/Analysis/InstCount.cpp b/lib/Analysis/InstCount.cpp
index 80f8bd8..38f0bba 100644
--- a/lib/Analysis/InstCount.cpp
+++ b/lib/Analysis/InstCount.cpp
@@ -21,13 +21,13 @@
using namespace llvm;
namespace {
- Statistic<> TotalInsts ("instcount", "Number of instructions (of all types)");
- Statistic<> TotalBlocks("instcount", "Number of basic blocks");
- Statistic<> TotalFuncs ("instcount", "Number of non-external functions");
- Statistic<> TotalMemInst("instcount", "Number of memory instructions");
+ Statistic TotalInsts ("instcount", "Number of instructions (of all types)");
+ Statistic TotalBlocks("instcount", "Number of basic blocks");
+ Statistic TotalFuncs ("instcount", "Number of non-external functions");
+ Statistic TotalMemInst("instcount", "Number of memory instructions");
#define HANDLE_INST(N, OPCODE, CLASS) \
- Statistic<> Num##OPCODE##Inst("instcount", "Number of " #OPCODE " insts");
+ Statistic Num##OPCODE##Inst("instcount", "Number of " #OPCODE " insts");
#include "llvm/Instruction.def"
diff --git a/lib/Analysis/ScalarEvolution.cpp b/lib/Analysis/ScalarEvolution.cpp
index 6e6d302..ba903e0 100644
--- a/lib/Analysis/ScalarEvolution.cpp
+++ b/lib/Analysis/ScalarEvolution.cpp
@@ -85,20 +85,20 @@
RegisterPass<ScalarEvolution>
R("scalar-evolution", "Scalar Evolution Analysis");
- Statistic<>
+ Statistic
NumBruteForceEvaluations("scalar-evolution",
"Number of brute force evaluations needed to "
"calculate high-order polynomial exit values");
- Statistic<>
+ Statistic
NumArrayLenItCounts("scalar-evolution",
"Number of trip counts computed with array length");
- Statistic<>
+ Statistic
NumTripCountsComputed("scalar-evolution",
"Number of loops with predictable loop counts");
- Statistic<>
+ Statistic
NumTripCountsNotComputed("scalar-evolution",
"Number of loops without predictable loop counts");
- Statistic<>
+ Statistic
NumBruteForceTripCountsComputed("scalar-evolution",
"Number of loops with trip counts computed by force");