PNaCl localmod mods in LLVM to 223109 (local files only)

lib/Target/ARM/ARMNaClRewritePass.cpp

 //===-- ARMNaClRewritePass.cpp - Native Client Rewrite Pass  ------*- C++ -*-=//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
 // Native Client Rewrite Pass
@@ skipping 12 matching lines @@
 
 #define DEBUG_TYPE "arm-sfi"
 #include "ARM.h"
 #include "ARMBaseInstrInfo.h"
 #include "ARMNaClRewritePass.h"
 #include "llvm/CodeGen/MachineFunctionPass.h"
 #include "llvm/CodeGen/MachineInstrBuilder.h"
 #include "llvm/IR/Function.h"
 #include "llvm/Support/Debug.h"
 #include "llvm/Support/raw_ostream.h"
-#include "llvm/Target/TargetMachine.h"
+#include "llvm/Target/TargetSubtargetInfo.h"
 #include <set>
 #include <stdio.h>
 
 using namespace llvm;
 
 namespace {
   class ARMNaClRewritePass : public MachineFunctionPass {
   public:
     static char ID;
     ARMNaClRewritePass() : MachineFunctionPass(ID) {}
@@ skipping 1005 matching lines @@
       SandboxMemory(MBB, MBBI, MI, AddrIdx, false);
       Modified = true;
     }
   }
   return Modified;
 }
 
 /**********************************************************************/
 
 bool ARMNaClRewritePass::runOnMachineFunction(MachineFunction &MF) {
-  TII = static_cast<const ARMBaseInstrInfo*>(MF.getTarget().getInstrInfo());
-  TRI = MF.getTarget().getRegisterInfo();
+  TII = static_cast<const ARMBaseInstrInfo*>(MF.getSubtarget().getInstrInfo());
+  TRI = MF.getSubtarget().getRegisterInfo();
 
   bool Modified = false;
   for (MachineFunction::iterator MFI = MF.begin(), E = MF.end();
        MFI != E;
        ++MFI) {
     MachineBasicBlock &MBB = *MFI;
 
     if (MBB.hasAddressTaken()) {
       //FIXME: use symbolic constant or get this value from some configuration
       MBB.setAlignment(4);
       Modified = true;
     }
 
     Modified |= SandboxMemoryReferencesInBlock(MBB);
     Modified |= SandboxBranchesInBlock(MBB);
     Modified |= SandboxStackChangesInBlock(MBB);
   }
   DEBUG(LightweightVerify(MF));
   return Modified;
 }
 
 /// createARMNaClRewritePass - returns an instance of the NaClRewritePass.
 FunctionPass *llvm::createARMNaClRewritePass() {
   return new ARMNaClRewritePass();
 }