[llvm] 0eab9d5 - [SCEV] Verify that all mapped SCEV AddRecs refer to valid loops.
Florian Hahn via llvm-commits
llvm-commits at lists.llvm.org
Wed Sep 30 04:47:50 PDT 2020
Author: Florian Hahn
Date: 2020-09-30T12:46:55+01:00
New Revision: 0eab9d5823815c6520697f8d725c402c88e5d050
URL: https://github.com/llvm/llvm-project/commit/0eab9d5823815c6520697f8d725c402c88e5d050
DIFF: https://github.com/llvm/llvm-project/commit/0eab9d5823815c6520697f8d725c402c88e5d050.diff
LOG: [SCEV] Verify that all mapped SCEV AddRecs refer to valid loops.
This check helps to guard against cases where expressions referring to
invalidated/deleted loops are not properly invalidated.
The additional check is motivated by the reproducer shared for 8fdac7cb7abb
and I think in general make sense as a sanity check.
Reviewed By: reames
Differential Revision: https://reviews.llvm.org/D88166
Added:
Modified:
llvm/lib/Analysis/ScalarEvolution.cpp
Removed:
################################################################################
diff --git a/llvm/lib/Analysis/ScalarEvolution.cpp b/llvm/lib/Analysis/ScalarEvolution.cpp
index 756710909ac7..8759f86e031d 100644
--- a/llvm/lib/Analysis/ScalarEvolution.cpp
+++ b/llvm/lib/Analysis/ScalarEvolution.cpp
@@ -12005,6 +12005,25 @@ void ScalarEvolution::verify() const {
std::abort();
}
}
+
+ // Collect all valid loops currently in LoopInfo.
+ SmallPtrSet<Loop *, 32> ValidLoops;
+ SmallVector<Loop *, 32> Worklist(LI.begin(), LI.end());
+ while (!Worklist.empty()) {
+ Loop *L = Worklist.pop_back_val();
+ if (ValidLoops.contains(L))
+ continue;
+ ValidLoops.insert(L);
+ Worklist.append(L->begin(), L->end());
+ }
+ // Check for SCEV expressions referencing invalid/deleted loops.
+ for (auto &KV : ValueExprMap) {
+ auto *AR = dyn_cast<SCEVAddRecExpr>(KV.second);
+ if (!AR)
+ continue;
+ assert(ValidLoops.contains(AR->getLoop()) &&
+ "AddRec references invalid loop");
+ }
}
bool ScalarEvolution::invalidate(
More information about the llvm-commits
mailing list