Changes from 3.7 merge to files not in upstream

lib/Transforms/NaCl/SimplifyStructRegSignatures.cpp

 //===- SimplifyStructRegSignatures.cpp - struct regs to struct pointers----===//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
 // This pass replaces function signatures exposing struct registers
@@ skipping 37 matching lines @@
 #include "llvm/IR/Type.h"
 #include "llvm/IR/Use.h"
 #include "llvm/IR/User.h"
 #include "llvm/IR/Value.h"
 #include "llvm/Pass.h"
 #include "llvm/PassInfo.h"
 #include "llvm/PassRegistry.h"
 #include "llvm/PassSupport.h"
 #include "llvm/Transforms/NaCl.h"
 #include "llvm/Support/Debug.h"
+#include "llvm/Support/raw_ostream.h"
 
 #include <cassert>
 #include <cstddef>
 
 using namespace llvm;
 
 namespace {
 
 static const unsigned int TypicalFuncArity = 8;
 
@@ skipping 403 matching lines @@
     UpdateArgNames(OldFunc, NewFunc);
     ApplyByValAndSRet(OldFunc, NewFunc);
 
     NewFunc->getBasicBlockList().splice(NewFunc->begin(),
                                         OldFunc->getBasicBlockList());
 
     fixFunctionBody(Ctx, OldFunc, NewFunc);
     FunctionsToDelete.insert(OldFunc);
     auto Found = DISubprogramMap.find(OldFunc);
     if (Found != DISubprogramMap.end())
-      Found->second.replaceFunction(NewFunc);
+      Found->second->replaceFunction(NewFunc);
   } else {
     AssociatedFctLoc = OldFunc;
   }
   scheduleInstructionsForCleanup(AssociatedFctLoc);
   return NewFT != OldFT;
 }
 
 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);
 
   // Change function signatures and fix a changed function body by
   // wiring the new arguments. Call sites are unchanged at this point.
   for (Module::iterator Iter = M.begin(), E = M.end(); Iter != E;) {
     Function *Func = Iter++;
     checkNoUnsupportedInstructions(Ctx, Func);
     Changed |= simplifyFunction(Ctx, Func, DISubprogramMap);
@@ skipping 33 matching lines @@
           errs() << *Resume << '\n';
           report_fatal_error(
               "Resumes with aggregate register signatures are not supported.");
         }
       }
 }
 
 ModulePass *llvm::createSimplifyStructRegSignaturesPass() {
   return new SimplifyStructRegSignatures();
 }