Changes from 3.7 merge to files not in upstream

lib/Transforms/NaCl/SimplifyStructRegSignatures.cpp

Index: lib/Transforms/NaCl/SimplifyStructRegSignatures.cpp
diff --git a/lib/Transforms/NaCl/SimplifyStructRegSignatures.cpp b/lib/Transforms/NaCl/SimplifyStructRegSignatures.cpp
index 32571bd688a95f48a6f065236d199409dcf650c4..7abec67fa8ff1a77f1c8db91c25b8608db7593e7 100644
--- a/lib/Transforms/NaCl/SimplifyStructRegSignatures.cpp
+++ b/lib/Transforms/NaCl/SimplifyStructRegSignatures.cpp
@@ -55,6 +55,7 @@
 #include "llvm/PassSupport.h"
 #include "llvm/Transforms/NaCl.h"
 #include "llvm/Support/Debug.h"
+#include "llvm/Support/raw_ostream.h"
 
 #include <cassert>
 #include <cstddef>
@@ -478,7 +479,7 @@ bool SimplifyStructRegSignatures::simplifyFunction(
     FunctionsToDelete.insert(OldFunc);
     auto Found = DISubprogramMap.find(OldFunc);
     if (Found != DISubprogramMap.end())
-      Found->second.replaceFunction(NewFunc);
+      Found->second->replaceFunction(NewFunc);
   } else {
     AssociatedFctLoc = OldFunc;
   }
@@ -489,10 +490,8 @@ bool SimplifyStructRegSignatures::simplifyFunction(
 bool SimplifyStructRegSignatures::runOnModule(Module &M) {
   bool Changed = false;
 
-  const DataLayout *DL = M.getDataLayout();
   unsigned PreferredAlignment = 0;
-  if (DL)
-    PreferredAlignment = DL->getStackAlignment();
+  PreferredAlignment = M.getDataLayout().getStackAlignment();
 
   LLVMContext &Ctx = M.getContext();
   auto DISubprogramMap = makeSubprogramMap(M);