diff options
| author | dim <dim@FreeBSD.org> | 2015-05-27 20:26:41 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2015-05-27 20:26:41 +0000 |
| commit | 5ef8fd3549d38e883a31881636be3dc2a275de20 (patch) | |
| tree | bd13a22d9db57ccf3eddbc07b32c18109521d050 /contrib/llvm/lib/Target/ARM/ARMHazardRecognizer.cpp | |
| parent | 77794ebe2d5718eb502c93ec32f8ccae4d8a0b7b (diff) | |
| parent | 782067d0278612ee75d024b9b135c221c327e9e8 (diff) | |
| download | FreeBSD-src-5ef8fd3549d38e883a31881636be3dc2a275de20.zip FreeBSD-src-5ef8fd3549d38e883a31881636be3dc2a275de20.tar.gz | |
Merge llvm trunk r238337 from ^/vendor/llvm/dist, resolve conflicts, and
preserve our customizations, where necessary.
Diffstat (limited to 'contrib/llvm/lib/Target/ARM/ARMHazardRecognizer.cpp')
| -rw-r--r-- | contrib/llvm/lib/Target/ARM/ARMHazardRecognizer.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/contrib/llvm/lib/Target/ARM/ARMHazardRecognizer.cpp b/contrib/llvm/lib/Target/ARM/ARMHazardRecognizer.cpp index 0e4f81c..0157c0a 100644 --- a/contrib/llvm/lib/Target/ARM/ARMHazardRecognizer.cpp +++ b/contrib/llvm/lib/Target/ARM/ARMHazardRecognizer.cpp @@ -44,16 +44,14 @@ ARMHazardRecognizer::getHazardType(SUnit *SU, int Stalls) { if (LastMI && (MCID.TSFlags & ARMII::DomainMask) != ARMII::DomainGeneral) { MachineInstr *DefMI = LastMI; const MCInstrDesc &LastMCID = LastMI->getDesc(); - const TargetMachine &TM = - MI->getParent()->getParent()->getTarget(); + const MachineFunction *MF = MI->getParent()->getParent(); const ARMBaseInstrInfo &TII = *static_cast<const ARMBaseInstrInfo *>( - TM.getSubtargetImpl()->getInstrInfo()); + MF->getSubtarget().getInstrInfo()); // Skip over one non-VFP / NEON instruction. if (!LastMI->isBarrier() && // On A9, AGU and NEON/FPU are muxed. - !(TII.getSubtarget().isLikeA9() && - (LastMI->mayLoad() || LastMI->mayStore())) && + !(TII.getSubtarget().isLikeA9() && LastMI->mayLoadOrStore()) && (LastMCID.TSFlags & ARMII::DomainMask) == ARMII::DomainGeneral) { MachineBasicBlock::iterator I = LastMI; if (I != LastMI->getParent()->begin()) { |
