summaryrefslogtreecommitdiffstats
path: root/llvm/lib/Target/Sparc
diff options
context:
space:
mode:
authorJakob Stoklund Olesen <stoklund@2pi.dk>2012-05-04 02:16:39 +0000
committerJakob Stoklund Olesen <stoklund@2pi.dk>2012-05-04 02:16:39 +0000
commit34a8f13e5ff07ec75908a39c7fb2aea27c3bfab0 (patch)
tree79005f7e59cc18fc6da39f58aa6136c908b7aa5e /llvm/lib/Target/Sparc
parent0f7d7ab968d32605acd47c3413f028aa5ae543a9 (diff)
downloadbcm5719-llvm-34a8f13e5ff07ec75908a39c7fb2aea27c3bfab0.tar.gz
bcm5719-llvm-34a8f13e5ff07ec75908a39c7fb2aea27c3bfab0.zip
Initialize SparcInstrInfo before SparcTargetLowering.
The TargetLowering construction needs to use a valid TargetRegisterInfo instance. llvm-svn: 156146
Diffstat (limited to 'llvm/lib/Target/Sparc')
-rw-r--r--llvm/lib/Target/Sparc/SparcTargetMachine.cpp3
-rw-r--r--llvm/lib/Target/Sparc/SparcTargetMachine.h2
2 files changed, 3 insertions, 2 deletions
diff --git a/llvm/lib/Target/Sparc/SparcTargetMachine.cpp b/llvm/lib/Target/Sparc/SparcTargetMachine.cpp
index cc253077a98..77fd2af88d0 100644
--- a/llvm/lib/Target/Sparc/SparcTargetMachine.cpp
+++ b/llvm/lib/Target/Sparc/SparcTargetMachine.cpp
@@ -34,7 +34,8 @@ SparcTargetMachine::SparcTargetMachine(const Target &T, StringRef TT,
: LLVMTargetMachine(T, TT, CPU, FS, Options, RM, CM, OL),
Subtarget(TT, CPU, FS, is64bit),
DataLayout(Subtarget.getDataLayout()),
- TLInfo(*this), TSInfo(*this), InstrInfo(Subtarget),
+ InstrInfo(Subtarget),
+ TLInfo(*this), TSInfo(*this),
FrameLowering(Subtarget) {
}
diff --git a/llvm/lib/Target/Sparc/SparcTargetMachine.h b/llvm/lib/Target/Sparc/SparcTargetMachine.h
index b203dfa4892..b2cc624e454 100644
--- a/llvm/lib/Target/Sparc/SparcTargetMachine.h
+++ b/llvm/lib/Target/Sparc/SparcTargetMachine.h
@@ -28,9 +28,9 @@ namespace llvm {
class SparcTargetMachine : public LLVMTargetMachine {
SparcSubtarget Subtarget;
const TargetData DataLayout; // Calculates type size & alignment
+ SparcInstrInfo InstrInfo;
SparcTargetLowering TLInfo;
SparcSelectionDAGInfo TSInfo;
- SparcInstrInfo InstrInfo;
SparcFrameLowering FrameLowering;
public:
SparcTargetMachine(const Target &T, StringRef TT,
OpenPOWER on IntegriCloud