diff options
| author | Evandro Menezes <e.menezes@samsung.com> | 2017-02-21 22:16:11 +0000 |
|---|---|---|
| committer | Evandro Menezes <e.menezes@samsung.com> | 2017-02-21 22:16:11 +0000 |
| commit | b9b7f4b8d3c804544d9764e00b365bfc8d9c793c (patch) | |
| tree | b0c310826d9522e706d49f25f344ab5048a47775 /llvm/lib/Target/X86 | |
| parent | bc9a13db0ec3c166ae92206fa9ab8848aef2ca1a (diff) | |
| download | bcm5719-llvm-b9b7f4b8d3c804544d9764e00b365bfc8d9c793c.tar.gz bcm5719-llvm-b9b7f4b8d3c804544d9764e00b365bfc8d9c793c.zip | |
[AArch64, X86] Guard against both instrs being wild cards
If both instrs are wild cards, the result can be a crash.
llvm-svn: 295776
Diffstat (limited to 'llvm/lib/Target/X86')
| -rw-r--r-- | llvm/lib/Target/X86/X86MacroFusion.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
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) { |
