fixup! use successor BBs in hash

michaelmaitland · michaelmaitland · commit 9e9afc2783de · 2024-10-31T10:27:05.000-07:00
diff --git a/llvm/lib/Transforms/Utils/SimplifyCFG.cpp b/llvm/lib/Transforms/Utils/SimplifyCFG.cpp
@@ -7449,7 +7449,10 @@ template <> struct DenseMapInfo<const SwitchInst::CaseHandle *> {
   }
   static unsigned getHashValue(const SwitchInst::CaseHandle *Case) {
     BasicBlock *Succ = Case->getCaseSuccessor();
-    return hash_combine(Succ->size(), Succ->getTerminator()->getOpcode());
+    BranchInst *BI = cast<BranchInst>(Succ->getTerminator());
+
+    auto It = BI->successors();
+    return hash_combine(Succ->size(), hash_combine_range(It.begin(), It.end()));
   }
   static bool isEqual(const SwitchInst::CaseHandle *LHS,
                       const SwitchInst::CaseHandle *RHS) {

Original file line number	Diff line number	Diff line change
`@@ -7449,7 +7449,10 @@ template <> struct DenseMapInfo<const SwitchInst::CaseHandle *> {`
`7449`	`7449`	`}`
`7450`	`7450`	`static unsigned getHashValue(const SwitchInst::CaseHandle *Case) {`
`7451`	`7451`	`BasicBlock *Succ = Case->getCaseSuccessor();`
`7452`		`- return hash_combine(Succ->size(), Succ->getTerminator()->getOpcode());`
	`7452`	`+ BranchInst *BI = cast<BranchInst>(Succ->getTerminator());`
	`7453`	`+`
	`7454`	`+ auto It = BI->successors();`
	`7455`	`+ return hash_combine(Succ->size(), hash_combine_range(It.begin(), It.end()));`
`7453`	`7456`	`}`
`7454`	`7457`	`static bool isEqual(const SwitchInst::CaseHandle *LHS,`
`7455`	`7458`	`const SwitchInst::CaseHandle *RHS) {`