[llvm-commits] [llvm] r61101 - in /llvm/trunk: lib/Transforms/IPO/GlobalOpt.cpp test/Transforms/GlobalOpt/2008-12-16-HeapSRACrash.ll test/Transforms/GlobalOpt/heap-sra-2.ll

[Chris Lattner]

Author: lattner
Date: Tue Dec 16 15:04:51 2008
New Revision: 61101

URL: http://llvm.org/viewvc/llvm-project?rev=61101&view=rev
Log:
fix a crash found by inspection.


Added:
    llvm/trunk/test/Transforms/GlobalOpt/2008-12-16-HeapSRACrash.ll
Modified:
    llvm/trunk/lib/Transforms/IPO/GlobalOpt.cpp
    llvm/trunk/test/Transforms/GlobalOpt/heap-sra-2.ll

Modified: llvm/trunk/lib/Transforms/IPO/GlobalOpt.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/IPO/GlobalOpt.cpp?rev=61101&r1=61100&r2=61101&view=diff

==============================================================================
--- llvm/trunk/lib/Transforms/IPO/GlobalOpt.cpp (original)
+++ llvm/trunk/lib/Transforms/IPO/GlobalOpt.cpp Tue Dec 16 15:04:51 2008
@@ -1055,7 +1055,7 @@
             // Otherwise, we don't know what it is.
             return false;
           }
-          return true;
+          continue;
         }
         
         // Otherwise we don't know what this is, not ok.

Added: llvm/trunk/test/Transforms/GlobalOpt/2008-12-16-HeapSRACrash.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/GlobalOpt/2008-12-16-HeapSRACrash.ll?rev=61101&view=auto

==============================================================================
--- llvm/trunk/test/Transforms/GlobalOpt/2008-12-16-HeapSRACrash.ll (added)
+++ llvm/trunk/test/Transforms/GlobalOpt/2008-12-16-HeapSRACrash.ll Tue Dec 16 15:04:51 2008
@@ -0,0 +1,27 @@
+; RUN: llvm-as < %s | opt -globalopt | llvm-dis
+target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:128:128"
+target triple = "i386-apple-darwin7"
+	%struct.foo = type { i32, i32 }
+ at X = internal global %struct.foo* null		; <%struct.foo**> [#uses=2]
+
+define void @bar(i32 %Size) nounwind noinline {
+entry:
+	%tmp = malloc [1000000 x %struct.foo]		; <[1000000 x %struct.foo]*> [#uses=1]
+	%.sub = getelementptr [1000000 x %struct.foo]* %tmp, i32 0, i32 0		; <%struct.foo*> [#uses=1]
+	store %struct.foo* %.sub, %struct.foo** @X, align 4
+	ret void
+}
+
+define i32 @baz() nounwind readonly noinline {
+bb1.thread:
+	%tmpLD1 = load %struct.foo** @X, align 4		; <%struct.foo*> [#uses=3]
+	store %struct.foo* %tmpLD1, %struct.foo** null
+	br label %bb1
+
+bb1:		; preds = %bb1, %bb1.thread
+	%tmp = phi %struct.foo* [ %tmpLD1, %bb1.thread ], [ %tmpLD1, %bb1 ]		; <%struct.foo*> [#uses=0]
+	br i1 false, label %bb2, label %bb1
+
+bb2:		; preds = %bb1
+	ret i32 0
+}

Modified: llvm/trunk/test/Transforms/GlobalOpt/heap-sra-2.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/GlobalOpt/heap-sra-2.ll?rev=61101&r1=61100&r2=61101&view=diff

==============================================================================
--- llvm/trunk/test/Transforms/GlobalOpt/heap-sra-2.ll (original)
+++ llvm/trunk/test/Transforms/GlobalOpt/heap-sra-2.ll Tue Dec 16 15:04:51 2008
@@ -6,7 +6,7 @@
 	%struct.foo = type { i32, i32 }
 @X = internal global %struct.foo* null		; <%struct.foo**> [#uses=2]
 
-define internal fastcc void @bar(i32 %Size) nounwind noinline {
+define void @bar(i32 %Size) nounwind noinline {
 entry:
 	%0 = malloc [1000000 x %struct.foo]
         ;%.sub = bitcast [1000000 x %struct.foo]* %0 to %struct.foo*
@@ -15,7 +15,7 @@
 	ret void
 }
 
-define internal fastcc i32 @baz() nounwind readonly noinline {
+define i32 @baz() nounwind readonly noinline {
 bb1.thread:
 	%0 = load %struct.foo** @X, align 4		; <%struct.foo*> [#uses=1]
 	br label %bb1
@@ -34,9 +34,3 @@
 	ret i32 %3
 }
 
-define i32 @main(i32 %argc, i8** %argv) nounwind {
-entry:
-	tail call fastcc void @bar(i32 %argc) nounwind noinline
-	%0 = tail call fastcc i32 @baz() nounwind		; <i32> [#uses=1]
-	ret i32 %0
-}