From 69b835486f5eddb415167ab9070a8df0e7085b9b Mon Sep 17 00:00:00 2001
From: Sanjay Patel <spatel@rotateright.com>
Date: Sun, 30 Jan 2022 10:02:20 -0500
Subject: [PATCH] Revert "[InstCombine] Do not combine atomic and non-atomic
 loads"

This reverts commit a2bb7313e62daa8aaa9b06fe57386ed7221a990a.

The baseline test was not pre-committed as expected.
---
 llvm/test/Transforms/InstCombine/phi.ll | 25 -------------------------
 1 file changed, 25 deletions(-)

diff --git a/llvm/test/Transforms/InstCombine/phi.ll b/llvm/test/Transforms/InstCombine/phi.ll
index 51d5baf0ef53..b9f54862b894 100644
--- a/llvm/test/Transforms/InstCombine/phi.ll
+++ b/llvm/test/Transforms/InstCombine/phi.ll
@@ -547,31 +547,6 @@ bb2:        ; preds = %bb1, %entry
   ret i32 %res
 }
 
-; FIXME: Atomic and non-atomic loads should not be combined.
-define i32 @PR51435(i32* %ptr, i32* %atomic_ptr, i1 %c) {
-; CHECK-LABEL: @PR51435(
-; CHECK:       entry:
-; CHECK-NEXT:    br i1 %c, label %if, label %end
-; CHECK:       if:
-; CHECK-NEXT:    [[ATOMIC:%.*]] = load atomic i32, i32* %atomic_ptr acquire, align 4
-; CHECK-NEXT:    br label %end
-; CHECK:       end:
-; CHECK-NEXT:    [[COND_IN:%.*]] = phi i32* [ %ptr, %entry ], [ %atomic_ptr, %if ]
-; CHECK-NEXT:    [[COND:%.*]] = load i32, i32* [[COND_IN]], align 4
-; CHECK-NEXT:    ret i32 [[COND]]
-entry:
-  %x = load i32, i32* %ptr, align 4
-  br i1 %c, label %if, label %end
-
-if:
-  %y = load atomic i32, i32* %atomic_ptr acquire, align 4
-  br label %end
-
-end:
-  %cond = phi i32 [ %x, %entry ], [ %y, %if ]
-  ret i32 %cond
-}
-
 define i1 @test18(i1 %cond) {
 ; CHECK-LABEL: @test18(
 ; CHECK-NEXT:    br i1 [[COND:%.*]], label [[TRUE:%.*]], label [[FALSE:%.*]]