Changes from 3.7 merge to files not in upstream

lib/Transforms/NaCl/ConstantInsertExtractElementIndex.cpp

 //===- ConstantInsertExtractElementIndex.cpp - Insert/Extract element -----===//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
 // Transform all InsertElement and ExtractElement with non-constant or
@@ skipping 16 matching lines @@
 using namespace llvm;
 
 namespace {
 class ConstantInsertExtractElementIndex : public BasicBlockPass {
 public:
   static char ID; // Pass identification, replacement for typeid
   ConstantInsertExtractElementIndex() : BasicBlockPass(ID), M(0), DL(0) {
     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;
     return false; // Unchanged.
   }
   bool runOnBasicBlock(BasicBlock &BB) override;
 
 private:
   typedef SmallVector<Instruction *, 8> Instructions;
   const Module *M;
@@ skipping 104 matching lines @@
     }
 
     I->replaceAllUsesWith(Res);
     I->eraseFromParent();
   }
 }
 
 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;
 
   findNonConstantInsertExtractElements(BB, OutOfRangeConstantIndices,
                                        NonConstantVectorIndices);
   if (!OutOfRangeConstantIndices.empty()) {
     Changed = true;
     fixOutOfRangeConstantIndices(BB, OutOfRangeConstantIndices);
   }
   if (!NonConstantVectorIndices.empty()) {
     Changed = true;
     fixNonConstantVectorIndices(BB, NonConstantVectorIndices);
   }
   return Changed;
 }
 
 BasicBlockPass *llvm::createConstantInsertExtractElementIndexPass() {
   return new ConstantInsertExtractElementIndex();
 }