summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--llvm/lib/Transforms/Scalar/GVNHoist.cpp1
-rw-r--r--llvm/test/Transforms/GVNHoist/hoist.ll33
2 files changed, 34 insertions, 0 deletions
diff --git a/llvm/lib/Transforms/Scalar/GVNHoist.cpp b/llvm/lib/Transforms/Scalar/GVNHoist.cpp
index 230558b4aa9..90c26e13db7 100644
--- a/llvm/lib/Transforms/Scalar/GVNHoist.cpp
+++ b/llvm/lib/Transforms/Scalar/GVNHoist.cpp
@@ -802,6 +802,7 @@ private:
// Move the instruction at the end of HoistPt.
Instruction *Last = HoistPt->getTerminator();
+ MD->removeInstruction(Repl);
Repl->moveBefore(Last);
DFSNumber[Repl] = DFSNumber[Last]++;
diff --git a/llvm/test/Transforms/GVNHoist/hoist.ll b/llvm/test/Transforms/GVNHoist/hoist.ll
index 8e189418d72..d4b4afdd5ad 100644
--- a/llvm/test/Transforms/GVNHoist/hoist.ll
+++ b/llvm/test/Transforms/GVNHoist/hoist.ll
@@ -711,3 +711,36 @@ return: ; preds = %if.end, %if.then
; CHECK: %[[load:.*]] = load i32, i32* %y, align 1
; CHECK: %[[phi:.*]] = phi i32 [ %[[load]], %{{.*}} ], [ %[[load]], %{{.*}} ]
; CHECK: i32 %[[phi]]
+
+
+declare i8 @pr30991_f() nounwind readonly
+declare void @pr30991_f1(i8)
+define i8 @pr30991(i8* %sp, i8* %word, i1 %b1, i1 %b2) {
+entry:
+ br i1 %b1, label %a, label %b
+
+a:
+ %r0 = load i8, i8* %word, align 1
+ %incdec.ptr = getelementptr i8, i8* %sp, i32 1
+ %rr0 = call i8 @pr30991_f() nounwind readonly
+ call void @pr30991_f1(i8 %r0)
+ ret i8 %rr0
+
+b:
+ br i1 %b2, label %c, label %x
+
+c:
+ %r1 = load i8, i8* %word, align 1
+ %incdec.ptr115 = getelementptr i8, i8* %sp, i32 1
+ %rr1 = call i8 @pr30991_f() nounwind readonly
+ call void @pr30991_f1(i8 %r1)
+ ret i8 %rr1
+
+x:
+ %r2 = load i8, i8* %word, align 1
+ ret i8 %r2
+}
+
+; CHECK-LABEL: define i8 @pr30991
+; CHECK: %r0 = load i8, i8* %word, align 1
+; CHECK-NEXT: br i1 %b1, label %a, label %b
OpenPOWER on IntegriCloud