[llvm-commits] [llvm] r37868 - in /llvm/trunk: lib/Transforms/Scalar/GVNPRE.cpp test/Transforms/GVNPRE/2007-07-03-PhiTranslateGEP.ll

[Owen Anderson]

Author: resistor
Date: Tue Jul  3 23:51:16 2007
New Revision: 37868

URL: http://llvm.org/viewvc/llvm-project?rev=37868&view=rev
Log:
Fix an error in phi translation of GEPs that was causing failures.

Added:
    llvm/trunk/test/Transforms/GVNPRE/2007-07-03-PhiTranslateGEP.ll
Modified:
    llvm/trunk/lib/Transforms/Scalar/GVNPRE.cpp

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

==============================================================================
--- llvm/trunk/lib/Transforms/Scalar/GVNPRE.cpp (original)
+++ llvm/trunk/lib/Transforms/Scalar/GVNPRE.cpp Tue Jul  3 23:51:16 2007
@@ -836,7 +836,7 @@
       }
     
     if (newOp1 != U->getPointerOperand() || changed_idx) {
-      Instruction* newVal = new GetElementPtrInst(U->getPointerOperand(),
+      Instruction* newVal = new GetElementPtrInst(newOp1,
                                        &newIdx[0], newIdx.size(),
                                        U->getName()+".expr");
       

Added: llvm/trunk/test/Transforms/GVNPRE/2007-07-03-PhiTranslateGEP.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/GVNPRE/2007-07-03-PhiTranslateGEP.ll?rev=37868&view=auto

==============================================================================
--- llvm/trunk/test/Transforms/GVNPRE/2007-07-03-PhiTranslateGEP.ll (added)
+++ llvm/trunk/test/Transforms/GVNPRE/2007-07-03-PhiTranslateGEP.ll Tue Jul  3 23:51:16 2007
@@ -0,0 +1,14 @@
+; RUN: llvm-as < %s | opt -gvnpre | llvm-dis
+
+define i64 @foo({ i32, i32 }** %__v) {
+entry:
+	br label %bb
+
+bb:		; preds = %bb, %entry
+	%__x.066.0 = phi { i32, i32 }* [ null, %entry ], [ null, %bb ]
+	%tmp2.i.i63 = getelementptr { i32, i32 }* %__x.066.0, i32 0, i32 1
+	br i1 false, label %bb, label %cond_true
+
+cond_true:		; preds = %bb
+	ret i64 0
+}