diff options
| -rw-r--r-- | lib/CodeGen/EarlyIfConversion.cpp | 4 | ||||
| -rw-r--r-- | lib/Target/ARM64/ARM64Subtarget.cpp | 2 | ||||
| -rw-r--r-- | lib/Target/X86/X86Subtarget.cpp | 5 |
3 files changed, 7 insertions, 4 deletions
diff --git a/lib/CodeGen/EarlyIfConversion.cpp b/lib/CodeGen/EarlyIfConversion.cpp index b621e10177..2d47be71be 100644 --- a/lib/CodeGen/EarlyIfConversion.cpp +++ b/lib/CodeGen/EarlyIfConversion.cpp @@ -777,7 +777,9 @@ bool EarlyIfConverter::runOnMachineFunction(MachineFunction &MF) { DEBUG(dbgs() << "********** EARLY IF-CONVERSION **********\n" << "********** Function: " << MF.getName() << '\n'); // Only run if conversion if the target wants it. - if (!MF.getTarget().getSubtarget().enableEarlyIfConversion()) + if (!MF.getTarget() + .getSubtarget<TargetSubtargetInfo>() + .enableEarlyIfConversion()) return true; TII = MF.getTarget().getInstrInfo(); diff --git a/lib/Target/ARM64/ARM64Subtarget.cpp b/lib/Target/ARM64/ARM64Subtarget.cpp index d81e21b51d..624e47483f 100644 --- a/lib/Target/ARM64/ARM64Subtarget.cpp +++ b/lib/Target/ARM64/ARM64Subtarget.cpp @@ -110,6 +110,6 @@ void ARM64Subtarget::overrideSchedPolicy(MachineSchedPolicy &Policy, Policy.OnlyBottomUp = false; } -bool ARM64Subtarget::enableEarlyIfConversion() const override { +bool ARM64Subtarget::enableEarlyIfConversion() const { return EnableEarlyIfConvert; } diff --git a/lib/Target/X86/X86Subtarget.cpp b/lib/Target/X86/X86Subtarget.cpp index a6ad386b0a..989e0d61b6 100644 --- a/lib/Target/X86/X86Subtarget.cpp +++ b/lib/Target/X86/X86Subtarget.cpp @@ -16,6 +16,7 @@ #include "llvm/IR/Attributes.h" #include "llvm/IR/Function.h" #include "llvm/IR/GlobalValue.h" +#include "llvm/Support/CommandLine.h" #include "llvm/Support/Debug.h" #include "llvm/Support/ErrorHandling.h" #include "llvm/Support/Host.h" @@ -319,6 +320,6 @@ X86Subtarget::enablePostRAScheduler(CodeGenOpt::Level OptLevel, } bool -X86Subtarget::enableEarlyIfConversion() const override { - return hasCMOV() && X86EarlyIfConv; +X86Subtarget::enableEarlyIfConversion() const { + return hasCMov() && X86EarlyIfConv; } |