Rebased PNaCl localmods in LLVM to 223109

lib/CodeGen/BranchFolding.cpp

 //===-- BranchFolding.cpp - Fold machine code branch instructions ---------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
 // This pass forwards branches to unconditional branches to make them branch
 // directly to the target block.  This pass often results in dead MBB's, which
 // it then removes.
 //
 // Note that this pass must be run after register allocation, it cannot handle
 // SSA form.
 //
 //===----------------------------------------------------------------------===//
 
 #include "BranchFolding.h"
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/ADT/SmallSet.h"
 #include "llvm/ADT/Statistic.h"
 #include "llvm/CodeGen/MachineBlockFrequencyInfo.h"
 #include "llvm/CodeGen/MachineBranchProbabilityInfo.h"
+#include "llvm/CodeGen/MachineConstantPool.h" //  @LOCALMOD
 #include "llvm/CodeGen/MachineFunctionPass.h"
 #include "llvm/CodeGen/MachineJumpTableInfo.h"
 #include "llvm/CodeGen/MachineModuleInfo.h"
 #include "llvm/CodeGen/MachineRegisterInfo.h"
 #include "llvm/CodeGen/Passes.h"
 #include "llvm/CodeGen/RegisterScavenging.h"
 #include "llvm/IR/Function.h"
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/Debug.h"
 #include "llvm/Support/ErrorHandling.h"
@@ skipping 205 matching lines @@
          I != E; ++I)
       for (unsigned op = 0, e = I->getNumOperands(); op != e; ++op) {
         MachineOperand &Op = I->getOperand(op);
         if (!Op.isJTI()) continue;
 
         // Remember that this JT is live.
         JTIsLive.set(Op.getIndex());
       }
   }
 
+  // @LOCALMOD-START
+  // This currently only used on ARM targets where the ConstantPool
+  // subclass is overloading getJumpTableIndex()
+  const std::vector<MachineConstantPoolEntry>& CPs =
+    MF.getConstantPool()->getConstants();
+  for (unsigned i = 0, e = CPs.size(); i != e; ++i) {
+    if (!CPs[i].isMachineConstantPoolEntry()) continue;
+    unsigned *JTIndex = CPs[i].Val.MachineCPVal->getJumpTableIndex();
+    if (!JTIndex) continue;
+    // Remember that this JT is live.
+    JTIsLive.set(*JTIndex);
+  }
+  // @LOCALMOD-END
+
   // Finally, remove dead jump tables.  This happens when the
   // indirect jump was unreachable (and thus deleted).
   for (unsigned i = 0, e = JTIsLive.size(); i != e; ++i)
     if (!JTIsLive.test(i)) {
       JTI->RemoveJumpTable(i);
       MadeChange = true;
     }
 
   delete RS;
   return MadeChange;
@@ skipping 1543 matching lines @@
     unsigned Def = LocalDefs[i];
     if (LocalDefsSet.count(Def)) {
       TBB->addLiveIn(Def);
       FBB->addLiveIn(Def);
     }
   }
 
   ++NumHoist;
   return true;
 }