Changes from 3.7 merge to files not in upstream

lib/Transforms/NaCl/GlobalizeConstantVectors.cpp

Index: lib/Transforms/NaCl/GlobalizeConstantVectors.cpp
diff --git a/lib/Transforms/NaCl/GlobalizeConstantVectors.cpp b/lib/Transforms/NaCl/GlobalizeConstantVectors.cpp
index 748dfdec7f8bd42480a96fb219cc7f6c68087245..2eb59ce6155e19a592640d183669921dc6c8d3c2 100644
--- a/lib/Transforms/NaCl/GlobalizeConstantVectors.cpp
+++ b/lib/Transforms/NaCl/GlobalizeConstantVectors.cpp
@@ -40,7 +40,6 @@ public:
   }
   virtual void getAnalysisUsage(AnalysisUsage &AU) const {
     AU.setPreservesCFG();
-    AU.addRequired<DataLayoutPass>();
   }
   virtual bool runOnModule(Module &M);
 
@@ -151,7 +150,7 @@ void GlobalizeConstantVectors::materializeConstantVectors(
 }
 
 bool GlobalizeConstantVectors::runOnModule(Module &M) {
-  DL = &getAnalysis<DataLayoutPass>().getDataLayout();
+  DL = &M.getDataLayout();
 
   FunctionConstantList FCs;
   FCs.reserve(M.size());