diff options
| -rw-r--r-- | lib/Target/TargetInstrInfo.cpp | 5 | ||||
| -rw-r--r-- | lib/Target/X86/X86InstrInfo.cpp | 11 |
2 files changed, 13 insertions, 3 deletions
diff --git a/lib/Target/TargetInstrInfo.cpp b/lib/Target/TargetInstrInfo.cpp index 9e706cdcfe..11b5b635db 100644 --- a/lib/Target/TargetInstrInfo.cpp +++ b/lib/Target/TargetInstrInfo.cpp @@ -88,9 +88,12 @@ bool TargetInstrInfo::PredicateInstruction(MachineInstr *MI, bool TargetInstrInfo::isUnpredicatedTerminator(const MachineInstr *MI) const { const TargetInstrDescriptor *TID = MI->getInstrDescriptor(); if (TID->Flags & M_TERMINATOR_FLAG) { + // Conditional branch is a special case. + if ((TID->Flags & M_BRANCH_FLAG) != 0 && (TID->Flags & M_BARRIER_FLAG) == 0) + return true; if ((TID->Flags & M_PREDICABLE) == 0) return true; return !isPredicated(MI); -} + } return false; } diff --git a/lib/Target/X86/X86InstrInfo.cpp b/lib/Target/X86/X86InstrInfo.cpp index 200ed45bb4..06b14fe1c4 100644 --- a/lib/Target/X86/X86InstrInfo.cpp +++ b/lib/Target/X86/X86InstrInfo.cpp @@ -404,11 +404,18 @@ X86::CondCode X86::GetOppositeBranchCondition(X86::CondCode CC) { // For purposes of branch analysis do not count FP_REG_KILL as a terminator. bool X86InstrInfo::isUnpredicatedTerminator(const MachineInstr *MI) const { - const TargetInstrDescriptor *TID = MI->getInstrDescriptor(); if (MI->getOpcode() == X86::FP_REG_KILL) return false; - if (TID->Flags & M_TERMINATOR_FLAG) + + const TargetInstrDescriptor *TID = MI->getInstrDescriptor(); + if (TID->Flags & M_TERMINATOR_FLAG) { + // Conditional branch is a special case. + if ((TID->Flags & M_BRANCH_FLAG) != 0 && (TID->Flags & M_BARRIER_FLAG) == 0) + return true; + if ((TID->Flags & M_PREDICABLE) == 0) + return true; return !isPredicated(MI); + } return false; } |