ScoreboardHazardRecognizer: unbreak TSAN by moving a static mutated variable to a member
From: Mehdi Amini <mehdi.amini@apple.com>
llvm-svn: 266837
diff --git a/llvm/include/llvm/CodeGen/ScoreboardHazardRecognizer.h b/llvm/include/llvm/CodeGen/ScoreboardHazardRecognizer.h
index ab14c2d..e0c30fe 100644
--- a/llvm/include/llvm/CodeGen/ScoreboardHazardRecognizer.h
+++ b/llvm/include/llvm/CodeGen/ScoreboardHazardRecognizer.h
@@ -83,11 +83,9 @@
void dump() const;
};
-#ifndef NDEBUG
// Support for tracing ScoreboardHazardRecognizer as a component within
- // another module. Follows the current thread-unsafe model of tracing.
- static const char *DebugType;
-#endif
+ // another module.
+ const char *DebugType;
// Itinerary data for the target.
const InstrItineraryData *ItinData;
diff --git a/llvm/lib/CodeGen/ScoreboardHazardRecognizer.cpp b/llvm/lib/CodeGen/ScoreboardHazardRecognizer.cpp
index e765486..69c4870 100644
--- a/llvm/lib/CodeGen/ScoreboardHazardRecognizer.cpp
+++ b/llvm/lib/CodeGen/ScoreboardHazardRecognizer.cpp
@@ -23,22 +23,13 @@
using namespace llvm;
-#define DEBUG_TYPE ::llvm::ScoreboardHazardRecognizer::DebugType
+#define DEBUG_TYPE DebugType
-#ifndef NDEBUG
-const char *ScoreboardHazardRecognizer::DebugType = "";
-#endif
-
-ScoreboardHazardRecognizer::
-ScoreboardHazardRecognizer(const InstrItineraryData *II,
- const ScheduleDAG *SchedDAG,
- const char *ParentDebugType) :
- ScheduleHazardRecognizer(), ItinData(II), DAG(SchedDAG), IssueWidth(0),
- IssueCount(0) {
-
-#ifndef NDEBUG
- DebugType = ParentDebugType;
-#endif
+ScoreboardHazardRecognizer::ScoreboardHazardRecognizer(
+ const InstrItineraryData *II, const ScheduleDAG *SchedDAG,
+ const char *ParentDebugType)
+ : ScheduleHazardRecognizer(), DebugType(ParentDebugType), ItinData(II),
+ DAG(SchedDAG), IssueWidth(0), IssueCount(0) {
// Determine the maximum depth of any itinerary. This determines the depth of
// the scoreboard. We always make the scoreboard at least 1 cycle deep to