diff options
| author | Eric Christopher <echristo@gmail.com> | 2014-09-26 01:28:10 +0000 |
|---|---|---|
| committer | Eric Christopher <echristo@gmail.com> | 2014-09-26 01:28:10 +0000 |
| commit | 3976f78247528d7f37006790d7c3c36a7c4d6621 (patch) | |
| tree | 35765d9442682dbe9f127d65fd4e3ecebdd8b679 | |
| parent | b4379f9c2c5de9d407d7a4d989683e2cc2d9fb56 (diff) | |
| download | bcm5719-llvm-3976f78247528d7f37006790d7c3c36a7c4d6621.tar.gz bcm5719-llvm-3976f78247528d7f37006790d7c3c36a7c4d6621.zip | |
Move resetTargetOptions from taking a MachineFunction to a Function
since we are accessing the TargetMachine that we're a member
function of.
llvm-svn: 218489
| -rw-r--r-- | llvm/include/llvm/Target/TargetMachine.h | 2 | ||||
| -rw-r--r-- | llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp | 2 | ||||
| -rw-r--r-- | llvm/lib/Target/TargetMachine.cpp | 20 |
3 files changed, 10 insertions, 14 deletions
diff --git a/llvm/include/llvm/Target/TargetMachine.h b/llvm/include/llvm/Target/TargetMachine.h index fc82dfa869f..82260c0d7c5 100644 --- a/llvm/include/llvm/Target/TargetMachine.h +++ b/llvm/include/llvm/Target/TargetMachine.h @@ -114,7 +114,7 @@ public: } /// \brief Reset the target options based on the function's attributes. - void resetTargetOptions(const MachineFunction *MF) const; + void resetTargetOptions(const Function &F) const; /// getMCAsmInfo - Return target specific asm information. /// diff --git a/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp b/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp index 32b327f7d6b..4ef3e6f94f5 100644 --- a/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp +++ b/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp @@ -421,7 +421,7 @@ bool SelectionDAGISel::runOnMachineFunction(MachineFunction &mf) { LibInfo = &getAnalysis<TargetLibraryInfo>(); GFI = Fn.hasGC() ? &getAnalysis<GCModuleInfo>().getFunctionInfo(Fn) : nullptr; - TM.resetTargetOptions(MF); + TM.resetTargetOptions(Fn); // Reset OptLevel to None for optnone functions. CodeGenOpt::Level NewOptLevel = OptLevel; diff --git a/llvm/lib/Target/TargetMachine.cpp b/llvm/lib/Target/TargetMachine.cpp index dcb83384693..309e1bf2786 100644 --- a/llvm/lib/Target/TargetMachine.cpp +++ b/llvm/lib/Target/TargetMachine.cpp @@ -48,17 +48,13 @@ TargetMachine::~TargetMachine() { } /// \brief Reset the target options based on the function's attributes. -void TargetMachine::resetTargetOptions(const MachineFunction *MF) const { - const Function *F = MF->getFunction(); - TargetOptions &TO = MF->getTarget().Options; - -#define RESET_OPTION(X, Y) \ - do { \ - if (F->hasFnAttribute(Y)) \ - TO.X = \ - (F->getAttributes(). \ - getAttribute(AttributeSet::FunctionIndex, \ - Y).getValueAsString() == "true"); \ +void TargetMachine::resetTargetOptions(const Function &F) const { +#define RESET_OPTION(X, Y) \ + do { \ + if (F.hasFnAttribute(Y)) \ + Options.X = (F.getAttributes() \ + .getAttribute(AttributeSet::FunctionIndex, Y) \ + .getValueAsString() == "true"); \ } while (0) RESET_OPTION(NoFramePointerElim, "no-frame-pointer-elim"); @@ -69,7 +65,7 @@ void TargetMachine::resetTargetOptions(const MachineFunction *MF) const { RESET_OPTION(UseSoftFloat, "use-soft-float"); RESET_OPTION(DisableTailCalls, "disable-tail-calls"); - TO.MCOptions.SanitizeAddress = F->hasFnAttribute(Attribute::SanitizeAddress); + Options.MCOptions.SanitizeAddress = F.hasFnAttribute(Attribute::SanitizeAddress); } /// getRelocationModel - Returns the code generation relocation model. The |
