projects
/
oota-llvm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove extraneous includes from the target machines.
[oota-llvm.git]
/
lib
/
Target
/
X86
/
X86TargetMachine.h
diff --git
a/lib/Target/X86/X86TargetMachine.h
b/lib/Target/X86/X86TargetMachine.h
index 57e6eda6bc156518231b36ea2e0a74d5f73d8c8c..41d51570b9ab4fa6ea0953bc46b553ae8b44f59d 100644
(file)
--- a/
lib/Target/X86/X86TargetMachine.h
+++ b/
lib/Target/X86/X86TargetMachine.h
@@
-13,12
+13,7
@@
#ifndef X86TARGETMACHINE_H
#define X86TARGETMACHINE_H
#ifndef X86TARGETMACHINE_H
#define X86TARGETMACHINE_H
-
-#include "X86FrameLowering.h"
-#include "X86ISelLowering.h"
#include "X86InstrInfo.h"
#include "X86InstrInfo.h"
-#include "X86JITInfo.h"
-#include "X86SelectionDAGInfo.h"
#include "X86Subtarget.h"
#include "llvm/IR/DataLayout.h"
#include "llvm/Target/TargetMachine.h"
#include "X86Subtarget.h"
#include "llvm/IR/DataLayout.h"
#include "llvm/Target/TargetMachine.h"
@@
-30,13
+25,6
@@
class StringRef;
class X86TargetMachine final : public LLVMTargetMachine {
virtual void anchor();
X86Subtarget Subtarget;
class X86TargetMachine final : public LLVMTargetMachine {
virtual void anchor();
X86Subtarget Subtarget;
- X86FrameLowering FrameLowering;
- InstrItineraryData InstrItins;
- const DataLayout DL; // Calculates type size & alignment
- X86InstrInfo InstrInfo;
- X86TargetLowering TLInfo;
- X86SelectionDAGInfo TSInfo;
- X86JITInfo JITInfo;
public:
X86TargetMachine(const Target &T, StringRef TT,
public:
X86TargetMachine(const Target &T, StringRef TT,
@@
-44,28
+32,28
@@
public:
Reloc::Model RM, CodeModel::Model CM,
CodeGenOpt::Level OL);
Reloc::Model RM, CodeModel::Model CM,
CodeGenOpt::Level OL);
- const DataLayout *getDataLayout() const override { return &DL; }
+ const DataLayout *getDataLayout() const override {
+ return getSubtargetImpl()->getDataLayout();
+ }
const X86InstrInfo *getInstrInfo() const override {
const X86InstrInfo *getInstrInfo() const override {
- return
&InstrInfo
;
+ return
getSubtargetImpl()->getInstrInfo()
;
}
const TargetFrameLowering *getFrameLowering() const override {
}
const TargetFrameLowering *getFrameLowering() const override {
- return &FrameLowering;
- }
- X86JITInfo *getJITInfo() override {
- return &JITInfo;
+ return getSubtargetImpl()->getFrameLowering();
}
}
+ X86JITInfo *getJITInfo() override { return Subtarget.getJITInfo(); }
const X86Subtarget *getSubtargetImpl() const override { return &Subtarget; }
const X86TargetLowering *getTargetLowering() const override {
const X86Subtarget *getSubtargetImpl() const override { return &Subtarget; }
const X86TargetLowering *getTargetLowering() const override {
- return
&TLInfo
;
+ return
getSubtargetImpl()->getTargetLowering()
;
}
const X86SelectionDAGInfo *getSelectionDAGInfo() const override {
}
const X86SelectionDAGInfo *getSelectionDAGInfo() const override {
- return
&TSInfo
;
+ return
getSubtargetImpl()->getSelectionDAGInfo()
;
}
const X86RegisterInfo *getRegisterInfo() const override {
return &getInstrInfo()->getRegisterInfo();
}
const InstrItineraryData *getInstrItineraryData() const override {
}
const X86RegisterInfo *getRegisterInfo() const override {
return &getInstrInfo()->getRegisterInfo();
}
const InstrItineraryData *getInstrItineraryData() const override {
- return &
InstrItins
;
+ return &
getSubtargetImpl()->getInstrItineraryData()
;
}
/// \brief Register X86 analysis passes with a pass manager.
}
/// \brief Register X86 analysis passes with a pass manager.