Changes from 3.7 merge to files not in upstream

lib/Transforms/NaCl/ConstantInsertExtractElementIndex.cpp

Index: lib/Transforms/NaCl/ConstantInsertExtractElementIndex.cpp
diff --git a/lib/Transforms/NaCl/ConstantInsertExtractElementIndex.cpp b/lib/Transforms/NaCl/ConstantInsertExtractElementIndex.cpp
index 50d896c5ef7086df139122b54b79284aed3d9bc0..743cada622337aa8cf72a98237e115e5e089eab9 100644
--- a/lib/Transforms/NaCl/ConstantInsertExtractElementIndex.cpp
+++ b/lib/Transforms/NaCl/ConstantInsertExtractElementIndex.cpp
@@ -34,10 +34,6 @@ public:
     initializeConstantInsertExtractElementIndexPass(
         *PassRegistry::getPassRegistry());
   }
-  void getAnalysisUsage(AnalysisUsage &AU) const override {
-    AU.addRequired<DataLayoutPass>();
-    BasicBlockPass::getAnalysisUsage(AU);
-  }
   using BasicBlockPass::doInitialization;
   bool doInitialization(Module &Mod) override {
     M = &Mod;
@@ -162,7 +158,7 @@ void ConstantInsertExtractElementIndex::fixNonConstantVectorIndices(
 bool ConstantInsertExtractElementIndex::runOnBasicBlock(BasicBlock &BB) {
   bool Changed = false;
   if (!DL)
-    DL = &getAnalysis<DataLayoutPass>().getDataLayout();
+    DL = &BB.getParent()->getParent()->getDataLayout();

[jvoung (off chromium), 2015/05/26 20:39:45]

nit: Could be BB.getModule()->getDataLayout();

[Derek Schuff, 2015/05/26 22:01:32]

Done.

   Instructions OutOfRangeConstantIndices;
   Instructions NonConstantVectorIndices;