Rebased PNaCl localmods in LLVM to 223109

lib/Target/ARM/ARMConstantIslandPass.cpp

 //===-- ARMConstantIslandPass.cpp - ARM constant islands ------------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
 // This file contains a pass that splits the constant pool up into 'islands'
@@ skipping 371 matching lines @@
   DEBUG(dbgs() << "***** ARMConstantIslands: "
                << MCP->getConstants().size() << " CP entries, aligned to "
                << MCP->getConstantPoolAlignment() << " bytes *****\n");
 
   TII = (const ARMBaseInstrInfo *)MF->getTarget()
             .getSubtargetImpl()
             ->getInstrInfo();
   AFI = MF->getInfo<ARMFunctionInfo>();
   STI = &MF->getTarget().getSubtarget<ARMSubtarget>();
 
+  if (!STI->useConstIslands()) return false;   // @LOCALMOD
+
   isThumb = AFI->isThumbFunction();
   isThumb1 = AFI->isThumb1OnlyFunction();
   isThumb2 = AFI->isThumb2Function();
 
   HasFarJump = false;
 
   // This pass invalidates liveness information when it splits basic blocks.
   MF->getRegInfo().invalidateLiveness();
 
   // Renumber all of the machine basic blocks in the function, guaranteeing that
@@ skipping 1666 matching lines @@
   MF->RenumberBlocks(NewBB);
 
   // Update the CFG.
   NewBB->addSuccessor(BB);
   JTBB->removeSuccessor(BB);
   JTBB->addSuccessor(NewBB);
 
   ++NumJTInserted;
   return NewBB;
 }