[llvm-commits] [llvm] r42920 - in /llvm/trunk: lib/Transforms/Scalar/InstructionCombining.cpp test/Transforms/InstCombine/2007-10-12-Crash.ll

[Chris Lattner]

Author: lattner
Date: Fri Oct 12 13:05:47 2007
New Revision: 42920

URL: http://llvm.org/viewvc/llvm-project?rev=42920&view=rev
Log:
Fix a bug in my patch last night that broke InstCombine/2007-10-12-Crash.ll


Added:
    llvm/trunk/test/Transforms/InstCombine/2007-10-12-Crash.ll
Modified:
    llvm/trunk/lib/Transforms/Scalar/InstructionCombining.cpp

Modified: llvm/trunk/lib/Transforms/Scalar/InstructionCombining.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/InstructionCombining.cpp?rev=42920&r1=42919&r2=42920&view=diff

==============================================================================
--- llvm/trunk/lib/Transforms/Scalar/InstructionCombining.cpp (original)
+++ llvm/trunk/lib/Transforms/Scalar/InstructionCombining.cpp Fri Oct 12 13:05:47 2007
@@ -8643,8 +8643,14 @@
       // converted to match the type of the cast, don't touch this.
       if (isa<AllocationInst>(BCI->getOperand(0))) {
         // See if the bitcast simplifies, if so, don't nuke this GEP yet.
-        if (visitBitCast(*BCI))
+        if (Instruction *I = visitBitCast(*BCI)) {
+          if (I != BCI) {
+            I->takeName(BCI);
+            BCI->getParent()->getInstList().insert(BCI, I);
+            ReplaceInstUsesWith(*BCI, I);
+          }
           return &GEP;
+        }
       }
       return new BitCastInst(BCI->getOperand(0), GEP.getType());
     }

Added: llvm/trunk/test/Transforms/InstCombine/2007-10-12-Crash.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/2007-10-12-Crash.ll?rev=42920&view=auto

==============================================================================
--- llvm/trunk/test/Transforms/InstCombine/2007-10-12-Crash.ll (added)
+++ llvm/trunk/test/Transforms/InstCombine/2007-10-12-Crash.ll Fri Oct 12 13:05:47 2007
@@ -0,0 +1,38 @@
+; RUN: llvm-as < %s | opt -instcombine -disable-output
+
+	%struct.Ray = type { %struct.Vec, %struct.Vec }
+	%struct.Scene = type { i32 (...)** }
+	%struct.Vec = type { double, double, double }
+
+declare double @_Z9ray_traceRK3VecRK3RayRK5Scene(%struct.Vec*, %struct.Ray*, %struct.Scene*)
+
+define i32 @main(i32 %argc, i8** %argv) {
+entry:
+	%tmp3 = alloca %struct.Ray, align 4		; <%struct.Ray*> [#uses=2]
+	%tmp97 = icmp slt i32 0, 512		; <i1> [#uses=1]
+	br i1 %tmp97, label %bb71, label %bb108
+
+bb29:		; preds = %bb62
+	%tmp322 = bitcast %struct.Ray* %tmp3 to %struct.Vec*		; <%struct.Vec*> [#uses=1]
+	%tmp322.0 = getelementptr %struct.Vec* %tmp322, i32 0, i32 0		; <double*> [#uses=1]
+	store double 0.000000e+00, double* %tmp322.0
+	%tmp57 = call double @_Z9ray_traceRK3VecRK3RayRK5Scene( %struct.Vec* null, %struct.Ray* %tmp3, %struct.Scene* null )		; <double> [#uses=0]
+	br label %bb62
+
+bb62:		; preds = %bb71, %bb29
+	%tmp65 = icmp slt i32 0, 4		; <i1> [#uses=1]
+	br i1 %tmp65, label %bb29, label %bb68
+
+bb68:		; preds = %bb62
+	ret i32 0
+
+bb71:		; preds = %entry
+	%tmp74 = icmp slt i32 0, 4		; <i1> [#uses=1]
+	br i1 %tmp74, label %bb62, label %bb77
+
+bb77:		; preds = %bb71
+	ret i32 0
+
+bb108:		; preds = %entry
+	ret i32 0
+}