diff options
| author | Owen Anderson <resistor@mac.com> | 2007-07-26 18:57:04 +0000 |
|---|---|---|
| committer | Owen Anderson <resistor@mac.com> | 2007-07-26 18:57:04 +0000 |
| commit | a377a24771eed5c4672556afb2c28e80af026d7b (patch) | |
| tree | 8e15f372af2a94836e54f561395b181a1f036440 | |
| parent | 45537917eec15e5c3ef75c0ee2bf8963b02f3a54 (diff) | |
Fix a bug introduced in my last commit.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@40542 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/Analysis/MemoryDependenceAnalysis.cpp | 8 | ||||
| -rw-r--r-- | test/Transforms/GVN/2007-07-25-InfiniteLoop.ll | 2 | ||||
| -rw-r--r-- | test/Transforms/GVN/2007-07-26-NonRedundant.ll | 16 |
3 files changed, 24 insertions, 2 deletions
diff --git a/lib/Analysis/MemoryDependenceAnalysis.cpp b/lib/Analysis/MemoryDependenceAnalysis.cpp index 064a0872bb..4bd877142a 100644 --- a/lib/Analysis/MemoryDependenceAnalysis.cpp +++ b/lib/Analysis/MemoryDependenceAnalysis.cpp @@ -117,12 +117,18 @@ bool MemoryDependenceAnalysis::nonLocalHelper(Instruction* query, visited.insert(block); bool inserted = false; + bool predOnStack = false; for (pred_iterator PI = pred_begin(block), PE = pred_end(block); PI != PE; ++PI) if (!visited.count(*PI)) inserted |= nonLocalHelper(query, *PI, resp, visited); - + else + predOnStack = true; + visited.erase(block); + + if (!inserted && !predOnStack) + resp.insert(std::make_pair(block, None)); return inserted; } diff --git a/test/Transforms/GVN/2007-07-25-InfiniteLoop.ll b/test/Transforms/GVN/2007-07-25-InfiniteLoop.ll index 50eaf2f8c0..442ba08374 100644 --- a/test/Transforms/GVN/2007-07-25-InfiniteLoop.ll +++ b/test/Transforms/GVN/2007-07-25-InfiniteLoop.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -gvn | llvm-dis +; RUN: llvm-as < %s | opt -gvn | llvm-dis | not grep {tmp10 =} %struct.INT2 = type { i32, i32 } @blkshifts = external global %struct.INT2* ; <%struct.INT2**> [#uses=2] diff --git a/test/Transforms/GVN/2007-07-26-NonRedundant.ll b/test/Transforms/GVN/2007-07-26-NonRedundant.ll new file mode 100644 index 0000000000..204803ad37 --- /dev/null +++ b/test/Transforms/GVN/2007-07-26-NonRedundant.ll @@ -0,0 +1,16 @@ +; RUN: llvm-as < %s | opt -gvn | llvm-dis + +@bsLive = external global i32 ; <i32*> [#uses=2] + +define i32 @bsR(i32 %n) { +entry: + br i1 false, label %cond_next, label %bb19 + +cond_next: ; preds = %entry + store i32 0, i32* @bsLive, align 4 + br label %bb19 + +bb19: ; preds = %cond_next, %entry + %tmp29 = load i32* @bsLive, align 4 ; <i32> [#uses=0] + ret i32 0 +} |