Changes from 3.7 merge to files not in upstream

lib/Transforms/NaCl/PromoteIntegers.cpp

 //===- PromoteIntegers.cpp - Promote illegal integers for PNaCl ABI -------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 // A limited set of transformations to promote illegal-sized int types.
 //
 //===----------------------------------------------------------------------===//
@@ skipping 697 matching lines @@
         }
       }
     } else {
       NewArg.takeName(OldArg);
       OldArg->replaceAllUsesWith(&NewArg);
     }
   }
 
   auto Found = DISubprogramMap.find(OldFct);
   if (Found != DISubprogramMap.end())
-    Found->second.replaceFunction(NewFct);
+    Found->second->replaceFunction(NewFct);
 
   return true;
 }
 
 bool PromoteIntegers::runOnModule(Module &M) {
   DataLayout DL(&M);
   LLVMContext &Ctx = M.getContext();
   bool Modified = false;
   auto DISubprogramMap = makeSubprogramMap(M);
 
   // Change function signatures first.
   for (auto I = M.begin(), E = M.end(); I != E;) {
     Function *F = I++;
     bool Changed = ensureCompliantSignature(Ctx, F, M, DISubprogramMap);
     if (Changed)
       F->eraseFromParent();
     Modified |= Changed;
   }
 
   for (auto &F : M.getFunctionList())
     Modified |= processFunction(F, DL);
 
   return Modified;
 }
 
 ModulePass *llvm::createPromoteIntegersPass() { return new PromoteIntegers(); }