commit 36fe028a2a8e58662af11f6a741d03bc551e4cc8
author Eric Christopher <echristo@gmail.com> Tue Feb 03 07:22:52 2015 +0000
committer Eric Christopher <echristo@gmail.com> Tue Feb 03 07:22:52 2015 +0000
tree 4105a31dbda3fa5786d1f6cda1e9ad50175ddff0
parent 8f276db622cb38e160de447c03281bac11f9d6c8

Only access TLOF via the TargetMachine, not TargetLowering.

llvm-svn: 227949

llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp

diff --git a/llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp b/llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
index c983bfb..57d6fae 100644
--- a/llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
+++ b/llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
@@ -129,7 +129,7 @@
 }
 
 const TargetLoweringObjectFile &AsmPrinter::getObjFileLowering() const {
-  return TM.getSubtargetImpl()->getTargetLowering()->getObjFileLowering();
+  return *TM.getObjFileLowering();
 }
 
 /// getDataLayout - Return information about data layout.

llvm/lib/CodeGen/LLVMTargetMachine.cpp

diff --git a/llvm/lib/CodeGen/LLVMTargetMachine.cpp b/llvm/lib/CodeGen/LLVMTargetMachine.cpp
index 617ed75..0fd1483 100644
--- a/llvm/lib/CodeGen/LLVMTargetMachine.cpp
+++ b/llvm/lib/CodeGen/LLVMTargetMachine.cpp
@@ -116,7 +116,7 @@
   // all the per-module stuff we're generating, including MCContext.
   MachineModuleInfo *MMI = new MachineModuleInfo(
       *TM->getMCAsmInfo(), *TM->getSubtargetImpl()->getRegisterInfo(),
-      &TM->getSubtargetImpl()->getTargetLowering()->getObjFileLowering());
+      TM->getObjFileLowering());
   PM.add(MMI);
 
   // Set up a MachineFunction for the rest of CodeGen to work on.