russell@unturf.com
db29a08762
B&W print-friendly diagrams + tinkerpop-0001 + wave-3 proof sections. Squash of 94 local commits onto remote master.
49 lines
2.4 KiB
Diff
49 lines
2.4 KiB
Diff
diff --git a/llvm/lib/Transforms/Utils/LCSSA.cpp b/llvm/lib/Transforms/Utils/LCSSA.cpp
|
|
index 1a2b3c4..2d3e4f5 100644
|
|
--- a/llvm/lib/Transforms/Utils/LCSSA.cpp
|
|
+++ b/llvm/lib/Transforms/Utils/LCSSA.cpp
|
|
@@ -65,9 +65,12 @@ static cl::opt<bool, true>
|
|
cl::desc("Verify loop lcssa form (time consuming)"));
|
|
|
|
/// Return true if the specified block is in the list.
|
|
+// CWE-407 fix: caller now passes a SmallPtrSet for O(1) membership instead of
|
|
+// a SmallVectorImpl whose is_contained was O(X) per use in the worklist loop.
|
|
static bool isExitBlock(BasicBlock *BB,
|
|
- const SmallVectorImpl<BasicBlock *> &ExitBlocks) {
|
|
- return is_contained(ExitBlocks, BB);
|
|
+ const SmallPtrSetImpl<BasicBlock *> &ExitBlockSet) {
|
|
+ return ExitBlockSet.count(BB); // CWE-407 fix: O(1)
|
|
}
|
|
|
|
// Cache the Loop ExitBlocks computed during the analysis. We expect to get a
|
|
@@ -74,7 +77,9 @@ static bool isExitBlock(BasicBlock *BB,
|
|
// expensive, and we're not mutating the loop structure.
|
|
-using LoopExitBlocksTy = SmallDenseMap<Loop *, SmallVector<BasicBlock *, 1>>;
|
|
+// CWE-407 fix: store both a vector (for iteration) and a set (for O(1) lookup).
|
|
+using LoopExitVecTy = SmallVector<BasicBlock *, 1>;
|
|
+using LoopExitSetTy = SmallPtrSet<BasicBlock *, 4>;
|
|
+using LoopExitBlocksTy = SmallDenseMap<Loop *, std::pair<LoopExitVecTy, LoopExitSetTy>>;
|
|
|
|
/// For every instruction from the worklist, check to see if it has any uses
|
|
/// that are outside the current loop. If so, insert LCSSA PHI nodes and
|
|
@@ -97,13 +103,17 @@ formLCSSAForInstructionsImpl(SmallVectorImpl<Instruction *> &Worklist,
|
|
auto [It, Inserted] = LoopExitBlocks.try_emplace(L);
|
|
if (Inserted)
|
|
- L->getExitBlocks(It->second);
|
|
- const SmallVectorImpl<BasicBlock *> &ExitBlocks = It->second;
|
|
+ {
|
|
+ L->getExitBlocks(It->second.first);
|
|
+ It->second.second.insert(It->second.first.begin(),
|
|
+ It->second.first.end());
|
|
+ }
|
|
+ const LoopExitVecTy &ExitBlocks = It->second.first;
|
|
+ const SmallPtrSetImpl<BasicBlock *> &ExitBlockSet = It->second.second;
|
|
|
|
if (ExitBlocks.empty())
|
|
continue;
|
|
@@ -225,7 +235,7 @@ formLCSSAForInstructionsImpl(SmallVectorImpl<Instruction *> &Worklist,
|
|
if (isa<PHINode>(UserBB->begin()) && isExitBlock(UserBB, ExitBlocks)) {
|
|
+ if (isa<PHINode>(UserBB->begin()) && isExitBlock(UserBB, ExitBlockSet)) {
|
|
UseToRewrite->set(&UserBB->front());
|
|
continue;
|
|
}
|