3 files changed, 4 insertions, 7 deletions
diff --git a/lib/CodeGen/EarlyIfConversion.cpp b/lib/CodeGen/EarlyIfConversion.cpp
index f5cf107..e49b9d3 100644
--- a/lib/CodeGen/EarlyIfConversion.cpp
+++ b/lib/CodeGen/EarlyIfConversion.cpp
@@ -586,13 +586,13 @@ void EarlyIfConverter::updateLoops(ArrayRef<MachineBasicBlock*> Removed) {
 
 /// Invalidate MachineTraceMetrics before if-conversion.
 void EarlyIfConverter::invalidateTraces() {
-  Traces->verify();
+  Traces->verifyAnalysis();
   Traces->invalidate(IfConv.Head);
   Traces->invalidate(IfConv.Tail);
   Traces->invalidate(IfConv.TBB);
   Traces->invalidate(IfConv.FBB);
   DEBUG(if (MinInstr) MinInstr->print(dbgs()));
-  Traces->verify();
+  Traces->verifyAnalysis();
 }
 
 /// Apply cost model and heuristics to the if-conversion in IfConv.
diff --git a/lib/CodeGen/MachineTraceMetrics.cpp b/lib/CodeGen/MachineTraceMetrics.cpp
index cf0d9c6..c31e6bd 100644
--- a/lib/CodeGen/MachineTraceMetrics.cpp
+++ b/lib/CodeGen/MachineTraceMetrics.cpp
@@ -284,7 +284,7 @@ void MachineTraceMetrics::invalidate(const MachineBasicBlock *MBB) {
       Ensembles[i]->invalidate(MBB);
 }
 
-void MachineTraceMetrics::verify() const {
+void MachineTraceMetrics::verifyAnalysis() const {
 #ifndef NDEBUG
   assert(BlockInfo.size() == MF->getNumBlockIDs() && "Outdated BlockInfo size");
   for (unsigned i = 0; i != TS_NumStrategies; ++i)
diff --git a/lib/CodeGen/MachineTraceMetrics.h b/lib/CodeGen/MachineTraceMetrics.h
index fa4970a..56ea74e 100644
--- a/lib/CodeGen/MachineTraceMetrics.h
+++ b/lib/CodeGen/MachineTraceMetrics.h
@@ -75,6 +75,7 @@ public:
   void getAnalysisUsage(AnalysisUsage&) const;
   bool runOnMachineFunction(MachineFunction&);
   void releaseMemory();
+  void verifyAnalysis() const;
 
   friend class Ensemble;
   friend class Trace;
@@ -212,10 +213,6 @@ public:
   /// is erased, or the CFG is otherwise changed.
   void invalidate(const MachineBasicBlock *MBB);
 
-  /// Verify the internal consistency of cached data.
-  /// This does nothing in NDEBUG builds.
-  void verify() const;
-
 private:
   // One entry per basic block, indexed by block number.
   SmallVector<FixedBlockInfo, 4> BlockInfo;