From bd14dc519ca2a0fc15f67288e25cdab4e84d9e98 Mon Sep 17 00:00:00 2001 From: Eric Christopher Date: Thu, 12 Jun 2014 22:05:46 +0000 Subject: Move PPCInstrInfo off of the target machine and onto the subtarget. llvm-svn: 210839 --- llvm/lib/Target/PowerPC/PPCTargetMachine.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'llvm/lib/Target/PowerPC/PPCTargetMachine.h') diff --git a/llvm/lib/Target/PowerPC/PPCTargetMachine.h b/llvm/lib/Target/PowerPC/PPCTargetMachine.h index 632c40618ff..ecfdf27591c 100644 --- a/llvm/lib/Target/PowerPC/PPCTargetMachine.h +++ b/llvm/lib/Target/PowerPC/PPCTargetMachine.h @@ -29,7 +29,6 @@ namespace llvm { /// class PPCTargetMachine : public LLVMTargetMachine { PPCSubtarget Subtarget; - PPCInstrInfo InstrInfo; PPCJITInfo JITInfo; PPCTargetLowering TLInfo; PPCSelectionDAGInfo TSInfo; @@ -40,7 +39,9 @@ public: Reloc::Model RM, CodeModel::Model CM, CodeGenOpt::Level OL, bool is64Bit); - const PPCInstrInfo *getInstrInfo() const override { return &InstrInfo; } + const PPCInstrInfo *getInstrInfo() const override { + return getSubtargetImpl()->getInstrInfo(); + } const PPCFrameLowering *getFrameLowering() const override { return getSubtargetImpl()->getFrameLowering(); } @@ -51,8 +52,8 @@ public: const PPCSelectionDAGInfo* getSelectionDAGInfo() const override { return &TSInfo; } - const PPCRegisterInfo *getRegisterInfo() const override { - return &InstrInfo.getRegisterInfo(); + const PPCRegisterInfo *getRegisterInfo() const override { + return &getInstrInfo()->getRegisterInfo(); } const DataLayout *getDataLayout() const override { -- cgit v1.2.3