[llvm-exegesis] Fix rL343680 in release mode.

llvm-svn: 343684
diff --git a/llvm/tools/llvm-exegesis/lib/Analysis.cpp b/llvm/tools/llvm-exegesis/lib/Analysis.cpp
index 4c05196..cb5d198 100644
--- a/llvm/tools/llvm-exegesis/lib/Analysis.cpp
+++ b/llvm/tools/llvm-exegesis/lib/Analysis.cpp
@@ -404,7 +404,7 @@
 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 @@
 #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>";
diff --git a/llvm/tools/llvm-exegesis/lib/Analysis.h b/llvm/tools/llvm-exegesis/lib/Analysis.h
index a52ea27..a65a2f1 100644
--- a/llvm/tools/llvm-exegesis/lib/Analysis.h
+++ b/llvm/tools/llvm-exegesis/lib/Analysis.h
@@ -53,6 +53,7 @@
     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>