commit d913448b38bab6ace92ae5057b917eb57035f83b
author Eric Christopher <echristo@gmail.com> Mon Aug 04 21:25:23 2014 +0000
committer Eric Christopher <echristo@gmail.com> Mon Aug 04 21:25:23 2014 +0000
tree f2050928fa5994c44fab60d66e7d89e7cc7d7a4f
parent acc8ef273b1c3796b0fc7f19aa347115b4bc2ea4

Remove the TargetMachine forwards for TargetSubtargetInfo based
information and update all callers. No functional change.

llvm-svn: 214781

llvm/lib/CodeGen/IfConversion.cpp

diff --git a/llvm/lib/CodeGen/IfConversion.cpp b/llvm/lib/CodeGen/IfConversion.cpp
index 1502d5f..5b6702b 100644
--- a/llvm/lib/CodeGen/IfConversion.cpp
+++ b/llvm/lib/CodeGen/IfConversion.cpp
@@ -269,9 +269,9 @@
 INITIALIZE_PASS_END(IfConverter, "if-converter", "If Converter", false, false)
 
 bool IfConverter::runOnMachineFunction(MachineFunction &MF) {
-  TLI = MF.getTarget().getTargetLowering();
-  TII = MF.getTarget().getInstrInfo();
-  TRI = MF.getTarget().getRegisterInfo();
+  TLI = MF.getTarget().getSubtargetImpl()->getTargetLowering();
+  TII = MF.getTarget().getSubtargetImpl()->getInstrInfo();
+  TRI = MF.getTarget().getSubtargetImpl()->getRegisterInfo();
   MBPI = &getAnalysis<MachineBranchProbabilityInfo>();
   MRI = &MF.getRegInfo();
 
@@ -287,9 +287,9 @@
   if (!PreRegAlloc) {
     // Tail merge tend to expose more if-conversion opportunities.
     BranchFolder BF(true, false);
-    BFChange = BF.OptimizeFunction(MF, TII,
-                                   MF.getTarget().getRegisterInfo(),
-                                   getAnalysisIfAvailable<MachineModuleInfo>());
+    BFChange = BF.OptimizeFunction(
+        MF, TII, MF.getTarget().getSubtargetImpl()->getRegisterInfo(),
+        getAnalysisIfAvailable<MachineModuleInfo>());
   }
 
   DEBUG(dbgs() << "\nIfcvt: function (" << ++FnNum <<  ") \'"
@@ -422,7 +422,7 @@
   if (MadeChange && IfCvtBranchFold) {
     BranchFolder BF(false, false);
     BF.OptimizeFunction(MF, TII,
-                        MF.getTarget().getRegisterInfo(),
+                        MF.getTarget().getSubtargetImpl()->getRegisterInfo(),
                         getAnalysisIfAvailable<MachineModuleInfo>());
   }