switch statistics over to not use static ctors.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@32709 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Bytecode/Writer/Writer.cpp b/lib/Bytecode/Writer/Writer.cpp
index c6bc22e..44a654b 100644
--- a/lib/Bytecode/Writer/Writer.cpp
+++ b/lib/Bytecode/Writer/Writer.cpp
@@ -17,6 +17,7 @@
//
//===----------------------------------------------------------------------===//
+#define DEBUG_TYPE "bytecodewriter"
#include "WriterInternals.h"
#include "llvm/Bytecode/WriteBytecodePass.h"
#include "llvm/CallingConv.h"
@@ -45,8 +46,7 @@
static RegisterPass<WriteBytecodePass> X("emitbytecode", "Bytecode Writer");
-static Statistic
-BytesWritten("bytecodewriter", "Number of bytecode bytes written");
+STATISTIC(BytesWritten, "Number of bytecode bytes written");
//===----------------------------------------------------------------------===//
//=== Output Primitives ===//
diff --git a/lib/Transforms/IPO/SimplifyLibCalls.cpp b/lib/Transforms/IPO/SimplifyLibCalls.cpp
index 08ae199..bbe020c 100644
--- a/lib/Transforms/IPO/SimplifyLibCalls.cpp
+++ b/lib/Transforms/IPO/SimplifyLibCalls.cpp
@@ -73,11 +73,11 @@
/// optimized by the subclass.
/// @brief Constructor that registers the optimization.
LibCallOptimization(const char *FName, const char *Description)
- : FunctionName(FName)
+ : FunctionName(FName) {
+
#ifndef NDEBUG
- , occurrences("simplify-libcalls", Description)
+ occurrences.construct("simplify-libcalls", Description);
#endif
- {
// Register this optimizer in the list of optimizations.
Next = OptList;
OptList = this;