[llvm] 6c255ac - Revert "[Hexagon] Some compound opportunities missed in presence of branches"

[Nico Weber via llvm-commits]

Author: Nico Weber
Date: 2022-01-06T15:32:14-05:00
New Revision: 6c255ac9695390d2bfdced8960fe13da3b8e7079

URL: https://github.com/llvm/llvm-project/commit/6c255ac9695390d2bfdced8960fe13da3b8e7079
DIFF: https://github.com/llvm/llvm-project/commit/6c255ac9695390d2bfdced8960fe13da3b8e7079.diff

LOG: Revert "[Hexagon] Some compound opportunities missed in presence of branches"

This reverts commit afdc6a0b8eeec1a8ebe52b103ac1fdcfb93db3b3.
Breaks check-lld, see e.g.:
https://lab.llvm.org/buildbot/#/builders/123/builds/8100/steps/8/logs/stdio

Added: 
    

Modified: 
    llvm/lib/Target/Hexagon/MCTargetDesc/HexagonMCCompound.cpp

Removed: 
    llvm/test/MC/Hexagon/bug28416.s


################################################################################
diff  --git a/llvm/lib/Target/Hexagon/MCTargetDesc/HexagonMCCompound.cpp b/llvm/lib/Target/Hexagon/MCTargetDesc/HexagonMCCompound.cpp
index 7d4828e7c66af..e7ade7834a9f4 100644
--- a/llvm/lib/Target/Hexagon/MCTargetDesc/HexagonMCCompound.cpp
+++ b/llvm/lib/Target/Hexagon/MCTargetDesc/HexagonMCCompound.cpp
@@ -365,10 +365,8 @@ static bool lookForCompound(MCInstrInfo const &MCII, MCContext &Context,
                MCI.begin() + HexagonMCInstrInfo::bundleInstructionsOffset;
            B != MCI.end(); ++B) {
         MCInst const *Inst = B->getInst();
-        if (JumpInst == Inst) {
-          BExtended = false;
+        if (JumpInst == Inst)
           continue;
-        }
         if (HexagonMCInstrInfo::isImmext(*Inst)) {
           BExtended = true;
           continue;

diff  --git a/llvm/test/MC/Hexagon/bug28416.s b/llvm/test/MC/Hexagon/bug28416.s
deleted file mode 100644
index 237d577a7a486..0000000000000
--- a/llvm/test/MC/Hexagon/bug28416.s
+++ /dev/null
@@ -1,11 +0,0 @@
-# RUN: llvm-mc -arch=hexagon -filetype=obj -o - %s | llvm-objdump -d -
-# r0 = r6 and jump ##undefined should compound to J4_jumpsetr
-
-# CHECK: { immext(#0)
-# CHECK:   r0 = r6 ; jump 0x0
-# CHECK:   r1 = memub(r6+#21)
-# CHECK:   memw(r9+#0) = r0 }
-{  memw(r9) = r0
-   r0 = r6
-   r1 = memub(r6+#21)
-   jump ##undefined }