diff options
| -rw-r--r-- | llvm/lib/Target/AArch64/AArch64MacroFusion.cpp | 9 | ||||
| -rw-r--r-- | llvm/lib/Target/X86/X86MacroFusion.cpp | 13 |
2 files changed, 12 insertions, 10 deletions
diff --git a/llvm/lib/Target/AArch64/AArch64MacroFusion.cpp b/llvm/lib/Target/AArch64/AArch64MacroFusion.cpp index a6965e8403b..cde2dab69b6 100644 --- a/llvm/lib/Target/AArch64/AArch64MacroFusion.cpp +++ b/llvm/lib/Target/AArch64/AArch64MacroFusion.cpp @@ -34,12 +34,13 @@ static bool shouldScheduleAdjacent(const AArch64InstrInfo &TII, const AArch64Subtarget &ST, const MachineInstr *First, const MachineInstr *Second) { + assert((First || Second) && "At least one instr must be specified"); unsigned FirstOpcode = - First ? First->getOpcode() - : static_cast<unsigned>(AArch64::INSTRUCTION_LIST_END); + First ? First->getOpcode() + : static_cast<unsigned>(AArch64::INSTRUCTION_LIST_END); unsigned SecondOpcode = - Second ? Second->getOpcode() - : static_cast<unsigned>(AArch64::INSTRUCTION_LIST_END); + Second ? Second->getOpcode() + : static_cast<unsigned>(AArch64::INSTRUCTION_LIST_END); if (ST.hasArithmeticBccFusion()) // Fuse CMN, CMP, TST followed by Bcc. diff --git a/llvm/lib/Target/X86/X86MacroFusion.cpp b/llvm/lib/Target/X86/X86MacroFusion.cpp index d09d8f36b77..ac44d920595 100644 --- a/llvm/lib/Target/X86/X86MacroFusion.cpp +++ b/llvm/lib/Target/X86/X86MacroFusion.cpp @@ -44,12 +44,13 @@ static bool shouldScheduleAdjacent(const X86Subtarget &ST, FuseInc } FuseKind; + assert((First || Second) && "At least one instr must be specified"); unsigned FirstOpcode = First - ? First->getOpcode() - : static_cast<unsigned>(X86::INSTRUCTION_LIST_END); - unsigned SecondOpcode = - Second ? Second->getOpcode() - : static_cast<unsigned>(X86::INSTRUCTION_LIST_END); + ? First->getOpcode() + : static_cast<unsigned>(X86::INSTRUCTION_LIST_END); + unsigned SecondOpcode = Second + ? Second->getOpcode() + : static_cast<unsigned>(X86::INSTRUCTION_LIST_END); switch (SecondOpcode) { default: @@ -215,7 +216,7 @@ void X86MacroFusion::apply(ScheduleDAGInstrs *DAGInstrs) { // For now, assume targets can only fuse with the branch. SUnit &ExitSU = DAG->ExitSU; MachineInstr *Branch = ExitSU.getInstr(); - if (!shouldScheduleAdjacent(ST, nullptr, Branch)) + if (!Branch || !shouldScheduleAdjacent(ST, nullptr, Branch)) return; for (SDep &PredDep : ExitSU.Preds) { |
