Fix an error in phi translation of GEPs that was causing failures.

llvm-svn: 37868
diff --git a/llvm/lib/Transforms/Scalar/GVNPRE.cpp b/llvm/lib/Transforms/Scalar/GVNPRE.cpp
index be86f3a..33926ea 100644
--- a/llvm/lib/Transforms/Scalar/GVNPRE.cpp
+++ b/llvm/lib/Transforms/Scalar/GVNPRE.cpp
@@ -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");
       
diff --git a/llvm/test/Transforms/GVNPRE/2007-07-03-PhiTranslateGEP.ll b/llvm/test/Transforms/GVNPRE/2007-07-03-PhiTranslateGEP.ll
new file mode 100644
index 0000000..65d70d9
--- /dev/null
+++ b/llvm/test/Transforms/GVNPRE/2007-07-03-PhiTranslateGEP.ll
@@ -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
+}