fix a crash found by inspection.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@61101 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Transforms/IPO/GlobalOpt.cpp b/lib/Transforms/IPO/GlobalOpt.cpp
index 1588486597a43b94d831b014d20882579f640494..ac8ff115fae8c117d3829f91b750d5e6a322335f 100644 (file)
--- a/lib/Transforms/IPO/GlobalOpt.cpp
+++ b/lib/Transforms/IPO/GlobalOpt.cpp
@@ -1055,7 +1055,7 @@ static bool GlobalLoadUsesSimpleEnoughForHeapSRA(GlobalVariable *GV,
             // Otherwise, we don't know what it is.
             return false;
           }
-          return true;
+          continue;
         }
         
         // Otherwise we don't know what this is, not ok.

diff --git a/test/Transforms/GlobalOpt/2008-12-16-HeapSRACrash.ll b/test/Transforms/GlobalOpt/2008-12-16-HeapSRACrash.ll
new file mode 100644 (file)
index 0000000..f284840
--- /dev/null
+++ b/test/Transforms/GlobalOpt/2008-12-16-HeapSRACrash.ll
@@ -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 }
+@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
+}

diff --git a/test/Transforms/GlobalOpt/heap-sra-2.ll b/test/Transforms/GlobalOpt/heap-sra-2.ll
index 47a2e8817087a00c1f6cb433e36587de4c37ba07..98f4a50227499fd171104cffd33c127aaad40f9a 100644 (file)
--- a/test/Transforms/GlobalOpt/heap-sra-2.ll
+++ b/test/Transforms/GlobalOpt/heap-sra-2.ll
@@ -6,7 +6,7 @@ target triple = "i386-apple-darwin7"
        %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 @@ entry:
        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 @@ bb2:          ; preds = %bb1
        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
-}