[llvm] r343684 - [llvm-exegesis] Fix rL343680 in release mode.

[Clement Courbet via llvm-commits]

Author: courbet
Date: Wed Oct  3 05:35:35 2018
New Revision: 343684

URL: http://llvm.org/viewvc/llvm-project?rev=343684&view=rev
Log:
[llvm-exegesis] Fix rL343680 in release mode.

Modified:
    llvm/trunk/tools/llvm-exegesis/lib/Analysis.cpp
    llvm/trunk/tools/llvm-exegesis/lib/Analysis.h

Modified: llvm/trunk/tools/llvm-exegesis/lib/Analysis.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-exegesis/lib/Analysis.cpp?rev=343684&r1=343683&r2=343684&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-exegesis/lib/Analysis.cpp (original)
+++ llvm/trunk/tools/llvm-exegesis/lib/Analysis.cpp Wed Oct  3 05:35:35 2018
@@ -404,7 +404,7 @@ getNonRedundantWriteProcRes(const llvm::
 Analysis::ResolvedSchedClass::ResolvedSchedClass(
     const llvm::MCSubtargetInfo &STI, unsigned ResolvedSchedClassId,
     bool WasVariant)
-    : SCDesc(STI.getSchedModel().getSchedClassDesc(ResolvedSchedClassId)),
+    : SchedClassId(ResolvedSchedClassId), SCDesc(STI.getSchedModel().getSchedClassDesc(ResolvedSchedClassId)),
       WasVariant(WasVariant),
       NonRedundantWriteProcRes(getNonRedundantWriteProcRes(*SCDesc, STI)),
       IdealizedProcResPressure(computeIdealizedProcResPressure(
@@ -669,7 +669,7 @@ llvm::Error Analysis::run<Analysis::Prin
 #if !defined(NDEBUG) || defined(LLVM_ENABLE_DUMP)
     writeEscaped<kEscapeHtml>(OS, RSCAndPoints.RSC.SCDesc->Name);
 #else
-    OS << SchedClassId;
+    OS << RSCAndPoints.RSC.SchedClassId;
 #endif
     OS << "</span> contains instructions whose performance characteristics do"
           " not match that of LLVM:</p>";

Modified: llvm/trunk/tools/llvm-exegesis/lib/Analysis.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-exegesis/lib/Analysis.h?rev=343684&r1=343683&r2=343684&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-exegesis/lib/Analysis.h (original)
+++ llvm/trunk/tools/llvm-exegesis/lib/Analysis.h Wed Oct  3 05:35:35 2018
@@ -53,6 +53,7 @@ private:
     ResolvedSchedClass(const llvm::MCSubtargetInfo &STI,
                        unsigned ResolvedSchedClassId, bool WasVariant);
 
+    const unsigned SchedClassId;
     const llvm::MCSchedClassDesc *const SCDesc;
     const bool WasVariant; // Whether the original class was variant.
     const llvm::SmallVector<llvm::MCWriteProcResEntry, 8>