[llvm-commits] [llvm] r40542 - in /llvm/trunk: lib/Analysis/MemoryDependenceAnalysis.cpp test/Transforms/GVN/2007-07-25-InfiniteLoop.ll test/Transforms/GVN/2007-07-26-NonRedundant.ll

[Owen Anderson]

Author: resistor
Date: Thu Jul 26 13:57:04 2007
New Revision: 40542

URL: http://llvm.org/viewvc/llvm-project?rev=40542&view=rev
Log:
Fix a bug introduced in my last commit.

Added:
    llvm/trunk/test/Transforms/GVN/2007-07-26-NonRedundant.ll
Modified:
    llvm/trunk/lib/Analysis/MemoryDependenceAnalysis.cpp
    llvm/trunk/test/Transforms/GVN/2007-07-25-InfiniteLoop.ll

Modified: llvm/trunk/lib/Analysis/MemoryDependenceAnalysis.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/MemoryDependenceAnalysis.cpp?rev=40542&r1=40541&r2=40542&view=diff

==============================================================================
--- llvm/trunk/lib/Analysis/MemoryDependenceAnalysis.cpp (original)
+++ llvm/trunk/lib/Analysis/MemoryDependenceAnalysis.cpp Thu Jul 26 13:57:04 2007
@@ -117,12 +117,18 @@
   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;
 }

Modified: llvm/trunk/test/Transforms/GVN/2007-07-25-InfiniteLoop.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/GVN/2007-07-25-InfiniteLoop.ll?rev=40542&r1=40541&r2=40542&view=diff

==============================================================================
--- llvm/trunk/test/Transforms/GVN/2007-07-25-InfiniteLoop.ll (original)
+++ llvm/trunk/test/Transforms/GVN/2007-07-25-InfiniteLoop.ll Thu Jul 26 13:57:04 2007
@@ -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]

Added: llvm/trunk/test/Transforms/GVN/2007-07-26-NonRedundant.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/GVN/2007-07-26-NonRedundant.ll?rev=40542&view=auto

==============================================================================
--- llvm/trunk/test/Transforms/GVN/2007-07-26-NonRedundant.ll (added)
+++ llvm/trunk/test/Transforms/GVN/2007-07-26-NonRedundant.ll Thu Jul 26 13:57:04 2007
@@ -0,0 +1,16 @@
+; RUN: llvm-as < %s | opt -gvn | llvm-dis
+
+ at 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
+}