[llvm] r210292 - Remove X86Subtarget from the X86FrameLowering constructor since
Eric Christopher
echristo at gmail.com
Thu Jun 5 15:10:59 PDT 2014
Author: echristo
Date: Thu Jun 5 17:10:58 2014
New Revision: 210292
URL: http://llvm.org/viewvc/llvm-project?rev=210292&view=rev
Log:
Remove X86Subtarget from the X86FrameLowering constructor since
we can just pass in the values we already know and we're not
caching the subtarget anymore.
Modified:
llvm/trunk/lib/Target/X86/X86FrameLowering.h
llvm/trunk/lib/Target/X86/X86TargetMachine.cpp
Modified: llvm/trunk/lib/Target/X86/X86FrameLowering.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86FrameLowering.h?rev=210292&r1=210291&r2=210292&view=diff
==============================================================================
--- llvm/trunk/lib/Target/X86/X86FrameLowering.h (original)
+++ llvm/trunk/lib/Target/X86/X86FrameLowering.h Thu Jun 5 17:10:58 2014
@@ -14,7 +14,6 @@
#ifndef X86_FRAMELOWERING_H
#define X86_FRAMELOWERING_H
-#include "X86Subtarget.h"
#include "llvm/Target/TargetFrameLowering.h"
namespace llvm {
@@ -24,9 +23,8 @@ class X86TargetMachine;
class X86FrameLowering : public TargetFrameLowering {
public:
- explicit X86FrameLowering(const X86Subtarget &sti)
- : TargetFrameLowering(StackGrowsDown, sti.getStackAlignment(),
- (sti.is64Bit() ? -8 : -4)) {}
+ explicit X86FrameLowering(StackDirection D, unsigned StackAl, int LAO)
+ : TargetFrameLowering(StackGrowsDown, StackAl, LAO) {}
void emitCalleeSavedFrameMoves(MachineBasicBlock &MBB,
MachineBasicBlock::iterator MBBI, DebugLoc DL,
Modified: llvm/trunk/lib/Target/X86/X86TargetMachine.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86TargetMachine.cpp?rev=210292&r1=210291&r2=210292&view=diff
==============================================================================
--- llvm/trunk/lib/Target/X86/X86TargetMachine.cpp (original)
+++ llvm/trunk/lib/Target/X86/X86TargetMachine.cpp Thu Jun 5 17:10:58 2014
@@ -70,19 +70,17 @@ static std::string computeDataLayout(con
/// X86TargetMachine ctor - Create an X86 target.
///
-X86TargetMachine::X86TargetMachine(const Target &T, StringRef TT,
- StringRef CPU, StringRef FS,
- const TargetOptions &Options,
+X86TargetMachine::X86TargetMachine(const Target &T, StringRef TT, StringRef CPU,
+ StringRef FS, const TargetOptions &Options,
Reloc::Model RM, CodeModel::Model CM,
CodeGenOpt::Level OL)
- : LLVMTargetMachine(T, TT, CPU, FS, Options, RM, CM, OL),
- Subtarget(TT, CPU, FS, Options.StackAlignmentOverride),
- FrameLowering(Subtarget),
- DL(computeDataLayout(*getSubtargetImpl())),
- InstrInfo(*this),
- TLInfo(*this),
- TSInfo(*this),
- JITInfo(*this) {
+ : LLVMTargetMachine(T, TT, CPU, FS, Options, RM, CM, OL),
+ Subtarget(TT, CPU, FS, Options.StackAlignmentOverride),
+ FrameLowering(TargetFrameLowering::StackGrowsDown,
+ Subtarget.getStackAlignment(),
+ Subtarget.is64Bit() ? -8 : -4),
+ DL(computeDataLayout(*getSubtargetImpl())), InstrInfo(*this),
+ TLInfo(*this), TSInfo(*this), JITInfo(*this) {
// Determine the PICStyle based on the target selected.
if (getRelocationModel() == Reloc::Static) {
// Unless we're in PIC or DynamicNoPIC mode, set the PIC style to None.
More information about the llvm-commits
mailing list