From 9eee94c5f71ffd7429a1e4b2664622f630988766 Mon Sep 17 00:00:00 2001
From: Owen Anderson <resistor@mac.com>
Date: Wed, 4 Jul 2007 04:51:16 +0000
Subject: [PATCH] Fix an error in phi translation of GEPs that was causing
 failures.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@37868 91177308-0d34-0410-b5e6-96231b3b80d8
---
 lib/Transforms/Scalar/GVNPRE.cpp                   |  2 +-
 .../GVNPRE/2007-07-03-PhiTranslateGEP.ll           | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 test/Transforms/GVNPRE/2007-07-03-PhiTranslateGEP.ll

diff --git a/lib/Transforms/Scalar/GVNPRE.cpp b/lib/Transforms/Scalar/GVNPRE.cpp
index be86f3a797f..33926ea127a 100644
--- a/lib/Transforms/Scalar/GVNPRE.cpp
+++ b/lib/Transforms/Scalar/GVNPRE.cpp
@@ -836,7 +836,7 @@ Value* GVNPRE::phi_translate(Value* V, BasicBlock* pred, BasicBlock* succ) {
       }
     
     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/test/Transforms/GVNPRE/2007-07-03-PhiTranslateGEP.ll b/test/Transforms/GVNPRE/2007-07-03-PhiTranslateGEP.ll
new file mode 100644
index 00000000000..65d70d95820
--- /dev/null
+++ b/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
+}