Changes from 3.7 merge to files not in upstream

lib/Transforms/NaCl/GlobalizeConstantVectors.cpp

 //===- GlobalizeConstantVectors.cpp - Globalize constant vector -----------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
 // This pass replaces all constant vector operands by loads of the same
@@ skipping 22 matching lines @@
 namespace {
 // Must be a ModulePass since it adds globals.
 class GlobalizeConstantVectors : public ModulePass {
 public:
   static char ID; // Pass identification, replacement for typeid
   GlobalizeConstantVectors() : ModulePass(ID), DL(0) {
     initializeGlobalizeConstantVectorsPass(*PassRegistry::getPassRegistry());
   }
   virtual void getAnalysisUsage(AnalysisUsage &AU) const {
     AU.setPreservesCFG();
-    AU.addRequired<DataLayoutPass>();
   }
   virtual bool runOnModule(Module &M);
 
 private:
   typedef SmallPtrSet<Constant *, 64> Constants;
   typedef std::pair<Function *, Constants> FunctionConstants;
   typedef std::vector<FunctionConstants> FunctionConstantList;
   typedef DenseMap<Constant *, GlobalVariable *> GlobalizedConstants;
   const DataLayout *DL;
 
@@ skipping 90 matching lines @@
            ++OI)
         if (dyn_cast<Constant>(*OI) == C)
           // The current operand is a use of the constant vector, replace it
           // with the materialized one.
           *OI = MaterializedGV;
     }
   }
 }
 
 bool GlobalizeConstantVectors::runOnModule(Module &M) {
-  DL = &getAnalysis<DataLayoutPass>().getDataLayout();
+  DL = &M.getDataLayout();
 
   FunctionConstantList FCs;
   FCs.reserve(M.size());
   for (Module::iterator FI = M.begin(), FE = M.end(); FI != FE; ++FI) {
     Constants Cs;
     findConstantVectors(*FI, Cs);
     if (!Cs.empty())
       FCs.push_back(std::make_pair(&*FI, Cs));
   }
 
   GlobalizedConstants GCs;
   createGlobalConstantVectors(M, FCs, GCs);
 
   for (FunctionConstantList::const_iterator FCI = FCs.begin(), FCE = FCs.end();
        FCI != FCE; ++FCI)
     materializeConstantVectors(*FCI->first, FCI->second, GCs);
 
   return FCs.empty();
 }
 
 ModulePass *llvm::createGlobalizeConstantVectorsPass() {
   return new GlobalizeConstantVectors();
 }