commit 1b21f0090488d6d55f8fc0f42f9f35adf3a47209
author Eric Christopher <echristo@gmail.com> Thu Jan 29 00:19:33 2015 +0000
committer Eric Christopher <echristo@gmail.com> Thu Jan 29 00:19:33 2015 +0000
tree 6e8c54c3da509e828300738cbd7e90459abaf606
parent 6f508c578bcbb5f850d9ba6c013b11a1c54aa753

Migrate ARM except for TTI, AsmPrinter, and frame lowering
away from getSubtargetImpl.

llvm-svn: 227399

llvm/lib/Target/ARM/ARMConstantIslandPass.cpp

diff --git a/llvm/lib/Target/ARM/ARMConstantIslandPass.cpp b/llvm/lib/Target/ARM/ARMConstantIslandPass.cpp
index 40b4b72..9966cd7 100644
--- a/llvm/lib/Target/ARM/ARMConstantIslandPass.cpp
+++ b/llvm/lib/Target/ARM/ARMConstantIslandPass.cpp
@@ -383,11 +383,9 @@
                << MCP->getConstants().size() << " CP entries, aligned to "
                << MCP->getConstantPoolAlignment() << " bytes *****\n");
 
-  TII = (const ARMBaseInstrInfo *)MF->getTarget()
-            .getSubtargetImpl()
-            ->getInstrInfo();
+  STI = &static_cast<const ARMSubtarget &>(MF->getSubtarget());
+  TII = STI->getInstrInfo();
   AFI = MF->getInfo<ARMFunctionInfo>();
-  STI = &MF->getTarget().getSubtarget<ARMSubtarget>();
 
   isThumb = AFI->isThumbFunction();
   isThumb1 = AFI->isThumb1OnlyFunction();