From 6a905f67f6822f9ed0385543a231c1e83609573c Mon Sep 17 00:00:00 2001 From: Evandro Menezes Date: Tue, 21 Feb 2017 22:16:11 +0000 Subject: [PATCH] [AArch64, X86] Guard against both instrs being wild cards If both instrs are wild cards, the result can be a crash. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@295776 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Target/AArch64/AArch64MacroFusion.cpp | 9 +++++---- lib/Target/X86/X86MacroFusion.cpp | 13 +++++++------ 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/lib/Target/AArch64/AArch64MacroFusion.cpp b/lib/Target/AArch64/AArch64MacroFusion.cpp index a6965e8403b..cde2dab69b6 100644 --- a/lib/Target/AArch64/AArch64MacroFusion.cpp +++ b/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(AArch64::INSTRUCTION_LIST_END); + First ? First->getOpcode() + : static_cast(AArch64::INSTRUCTION_LIST_END); unsigned SecondOpcode = - Second ? Second->getOpcode() - : static_cast(AArch64::INSTRUCTION_LIST_END); + Second ? Second->getOpcode() + : static_cast(AArch64::INSTRUCTION_LIST_END); if (ST.hasArithmeticBccFusion()) // Fuse CMN, CMP, TST followed by Bcc. diff --git a/lib/Target/X86/X86MacroFusion.cpp b/lib/Target/X86/X86MacroFusion.cpp index d09d8f36b77..ac44d920595 100644 --- a/lib/Target/X86/X86MacroFusion.cpp +++ b/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(X86::INSTRUCTION_LIST_END); - unsigned SecondOpcode = - Second ? Second->getOpcode() - : static_cast(X86::INSTRUCTION_LIST_END); + ? First->getOpcode() + : static_cast(X86::INSTRUCTION_LIST_END); + unsigned SecondOpcode = Second + ? Second->getOpcode() + : static_cast(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) { -- 2.50.1