[llvm] 92fccea - Revert "[Reassociate] Use disjoint flag to convert Or to Add. (#72772)"

[Craig Topper via llvm-commits]

Author: Craig Topper
Date: 2023-12-06T13:50:21-08:00
New Revision: 92fccea2e50030ac849313010e2d3914b953c6c6

URL: https://github.com/llvm/llvm-project/commit/92fccea2e50030ac849313010e2d3914b953c6c6
DIFF: https://github.com/llvm/llvm-project/commit/92fccea2e50030ac849313010e2d3914b953c6c6.diff

LOG: Revert "[Reassociate] Use disjoint flag to convert Or to Add. (#72772)"

This reverts commit 78964457cf1bafe57a54629fafbd081452a9e528.

Looks like I didn't rebase this correctly before commit

Added: 
    

Modified: 
    llvm/lib/Transforms/Scalar/Reassociate.cpp
    llvm/test/Transforms/Reassociate/add-like-or.ll

Removed: 
    


################################################################################
diff  --git a/llvm/lib/Transforms/Scalar/Reassociate.cpp b/llvm/lib/Transforms/Scalar/Reassociate.cpp
index 9f1b47990b7361..d3f6d24d909611 100644
--- a/llvm/lib/Transforms/Scalar/Reassociate.cpp
+++ b/llvm/lib/Transforms/Scalar/Reassociate.cpp
@@ -2256,10 +2256,9 @@ void ReassociatePass::OptimizeInst(Instruction *I) {
   // with no common bits set, convert it to X+Y.
   if (I->getOpcode() == Instruction::Or &&
       shouldConvertOrWithNoCommonBitsToAdd(I) && !isLoadCombineCandidate(I) &&
-      (I->isDisjoint() ||
-       haveNoCommonBitsSet(I->getOperand(0), I->getOperand(1),
-                           SimplifyQuery(I->getModule()->getDataLayout(),
-                                         /*DT=*/nullptr, /*AC=*/nullptr, I)))) {
+      haveNoCommonBitsSet(I->getOperand(0), I->getOperand(1),
+                          SimplifyQuery(I->getModule()->getDataLayout(),
+                                        /*DT=*/nullptr, /*AC=*/nullptr, I))) {
     Instruction *NI = convertOrWithNoCommonBitsToAdd(I);
     RedoInsts.insert(I);
     MadeChange = true;

diff  --git a/llvm/test/Transforms/Reassociate/add-like-or.ll b/llvm/test/Transforms/Reassociate/add-like-or.ll
index d88458f630bc05..514b10b5a76b3b 100644
--- a/llvm/test/Transforms/Reassociate/add-like-or.ll
+++ b/llvm/test/Transforms/Reassociate/add-like-or.ll
@@ -59,18 +59,6 @@ define i32 @test3(i32 %x, i32 %bit) {
   ret i32 %res
 }
 
-; Test that disjoint allow reassociation.
-define i32 @test4(i32 %a, i32 %b) {
-; CHECK-LABEL: @test4(
-; CHECK-NEXT:    [[C:%.*]] = add i32 [[A:%.*]], 1
-; CHECK-NEXT:    [[C_PLUS_ONE:%.*]] = add i32 [[C]], [[B:%.*]]
-; CHECK-NEXT:    ret i32 [[C_PLUS_ONE]]
-;
-  %c = or disjoint i32 %a, %b
-  %c.plus.one = add i32 %c, 1
-  ret i32 %c.plus.one
-}
-
 declare i32 @llvm.ctlz.i32(i32, i1 immarg) #2
 
 !0 = !{i32 0, i32 33}