Refactor statistic a big and introduce a horrible-but-necessary macro

(STATISTIC), which allows us to define statistics that don't introduce
static ctors into the .o files.  I'm migrating code over to use this
incrementally.

llvm-svn: 32687

1 files changed, 4 insertions, 4 deletions

diff --git a/llvm/lib/Support/Statistic.cpp b/llvm/lib/Support/Statistic.cpp
index a698a004a8e..8fdd44aace1 100644
--- a/llvm/lib/Support/Statistic.cpp
+++ b/llvm/lib/Support/Statistic.cpp
@@ -45,11 +45,11 @@ namespace {
 /// on demand (when the first statistic is bumped) and destroyed only when 
 /// llvm_shutdown is called.  We print statistics from the destructor.
 class StatisticInfo {
-  std::vector<const Statistic*> Stats;
+  std::vector<const StatisticBase*> Stats;
 public:
   ~StatisticInfo();
   
-  void addStatistic(const Statistic *S) {
+  void addStatistic(const StatisticBase *S) {
     Stats.push_back(S);
   }
 };
@@ -60,7 +60,7 @@ static ManagedStatic<StatisticInfo> StatInfo;
 
 /// RegisterStatistic - The first time a statistic is bumped, this method is
 /// called.
-void Statistic::RegisterStatistic() {
+void StatisticBase::RegisterStatistic() {
   // If stats are enabled, inform StatInfo that this statistic should be
   // printed.
   if (Enabled)
@@ -70,7 +70,7 @@ void Statistic::RegisterStatistic() {
 }
 
 struct NameCompare {
-  bool operator()(const Statistic *LHS, const Statistic *RHS) const {
+  bool operator()(const StatisticBase *LHS, const StatisticBase *RHS) const {
     int Cmp = std::strcmp(LHS->getName(), RHS->getName());
     if (Cmp != 0) return Cmp < 0;