diff --git a/include/llvm/ADT/Statistic.h b/include/llvm/ADT/Statistic.h
index de7dabc382c..528d2cdcf61 100644
--- a/include/llvm/ADT/Statistic.h
+++ b/include/llvm/ADT/Statistic.h
@@ -55,7 +55,8 @@ public:
   std::atomic<unsigned> Value;
   std::atomic<bool> Initialized;
 
-  TrackingStatistic(const char *DebugType, const char *Name, const char *Desc)
+  constexpr TrackingStatistic(const char *DebugType, const char *Name,
+                              const char *Desc)
       : DebugType(DebugType), Name(Name), Desc(Desc), Value(0),
         Initialized(false) {}
 
diff --git a/lib/CodeGen/LiveDebugValues/InstrRefBasedImpl.cpp b/lib/CodeGen/LiveDebugValues/InstrRefBasedImpl.cpp
index 5385793b258..ead953cbb8e 100644
--- a/lib/CodeGen/LiveDebugValues/InstrRefBasedImpl.cpp
+++ b/lib/CodeGen/LiveDebugValues/InstrRefBasedImpl.cpp
@@ -201,9 +201,6 @@ using namespace llvm;
 
 #define DEBUG_TYPE "livedebugvalues"
 
-STATISTIC(NumInserted, "Number of DBG_VALUE instructions inserted");
-STATISTIC(NumRemoved, "Number of DBG_VALUE instructions removed");
-
 // Act more like the VarLoc implementation, by propagating some locations too
 // far and ignoring some transfers.
 static cl::opt<bool> EmulateOldLDV("emulate-old-livedebugvalues", cl::Hidden,
diff --git a/lib/Transforms/IPO/Attributor.cpp b/lib/Transforms/IPO/Attributor.cpp
index 665abfa210c..cc8804f9d9d 100644
--- a/lib/Transforms/IPO/Attributor.cpp
+++ b/lib/Transforms/IPO/Attributor.cpp
@@ -63,8 +63,6 @@ STATISTIC(NumAttributesValidFixpoint,
           "Number of abstract attributes in a valid fixpoint state");
 STATISTIC(NumAttributesManifested,
           "Number of abstract attributes manifested in IR");
-STATISTIC(NumAttributesFixedDueToRequiredDependences,
-          "Number of abstract attributes fixed due to required dependences");
 
 // TODO: Determine a good default value.
 //
diff --git a/lib/Transforms/Utils/BuildLibCalls.cpp b/lib/Transforms/Utils/BuildLibCalls.cpp
index 33740eaee0f..0d685c0c87d 100644
--- a/lib/Transforms/Utils/BuildLibCalls.cpp
+++ b/lib/Transforms/Utils/BuildLibCalls.cpp
@@ -44,7 +44,6 @@ STATISTIC(NumSExtArg, "Number of arguments inferred as signext");
 STATISTIC(NumReadOnlyArg, "Number of arguments inferred as readonly");
 STATISTIC(NumNoAlias, "Number of function returns inferred as noalias");
 STATISTIC(NumNoUndef, "Number of function returns inferred as noundef returns");
-STATISTIC(NumNonNull, "Number of function returns inferred as nonnull returns");
 STATISTIC(NumReturnedArg, "Number of arguments inferred as returned");
 STATISTIC(NumWillReturn, "Number of functions inferred as willreturn");