[llvm] 3624491 - Revert "[BranchRelaxation] Move faulting_op check into callee [nfc]"

[Philip Reames via llvm-commits]

Author: Philip Reames
Date: 2023-01-27T11:52:22-08:00
New Revision: 36244914b42e9ec6b9f01d95efe17c693ae950bc

URL: https://github.com/llvm/llvm-project/commit/36244914b42e9ec6b9f01d95efe17c693ae950bc
DIFF: https://github.com/llvm/llvm-project/commit/36244914b42e9ec6b9f01d95efe17c693ae950bc.diff

LOG: Revert "[BranchRelaxation] Move faulting_op check into callee [nfc]"

This reverts commit c549da959b81902789a17918c5b95d4449e6fdfa.  Per buildbots, this was not NFC.

Added: 
    

Modified: 
    llvm/lib/CodeGen/BranchRelaxation.cpp

Removed: 
    


################################################################################
diff  --git a/llvm/lib/CodeGen/BranchRelaxation.cpp b/llvm/lib/CodeGen/BranchRelaxation.cpp
index 81d13617c37b..016c81dc5aa4 100644
--- a/llvm/lib/CodeGen/BranchRelaxation.cpp
+++ b/llvm/lib/CodeGen/BranchRelaxation.cpp
@@ -284,12 +284,6 @@ MachineBasicBlock *BranchRelaxation::splitBlockBeforeInstr(MachineInstr &MI,
 /// specific BB can fit in MI's displacement field.
 bool BranchRelaxation::isBlockInRange(
   const MachineInstr &MI, const MachineBasicBlock &DestBB) const {
-
-  // FAULTING_OP's destination is not encoded in the instruction stream
-  // and thus always in range.
-  if (MI.getOpcode() == TargetOpcode::FAULTING_OP)
-    return true;
-
   int64_t BrOffset = getInstrOffset(MI);
   int64_t DestOffset = BlockInfo[DestBB.getNumber()].Offset;
 
@@ -564,6 +558,11 @@ bool BranchRelaxation::relaxBranchInstructions() {
       if (!MI.isConditionalBranch())
         continue;
 
+      if (MI.getOpcode() == TargetOpcode::FAULTING_OP)
+        // FAULTING_OP's destination is not encoded in the instruction stream
+        // and thus never needs relaxed.
+        continue;
+
       MachineBasicBlock *DestBB = TII->getBranchDestBlock(MI);
       if (!isBlockInRange(MI, *DestBB)) {
         if (Next != MBB.end() && Next->isConditionalBranch()) {