Update ReplacePtrsWithInts to also fix up refs from subprogram debug metadata.

lib/Transforms/NaCl/ReplacePtrsWithInts.cpp

 //===- ReplacePtrsWithInts.cpp - Convert pointer values to integer values--===//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
 // This pass strips out aggregate pointer types and replaces them with
@@ skipping 28 matching lines @@
 //
 // This pass currently strips out lifetime markers (that is, calls to
 // the llvm.lifetime.start/end intrinsics) and invariant markers
 // (calls to llvm.invariant.start/end).
 //
 //===----------------------------------------------------------------------===//
 
 #include "llvm/ADT/DenseMap.h"
 #include "llvm/ADT/SmallPtrSet.h"
 #include "llvm/IR/DataLayout.h"
+#include "llvm/IR/DebugInfo.h"
 #include "llvm/IR/DerivedTypes.h"
 #include "llvm/IR/Function.h"
 #include "llvm/IR/Instructions.h"
 #include "llvm/IR/IntrinsicInst.h"
 #include "llvm/IR/Module.h"
 #include "llvm/IR/Type.h"
 #include "llvm/Pass.h"
 #include "llvm/Support/raw_ostream.h"
 #include "llvm/Transforms/NaCl.h"
 
@@ skipping 501 matching lines @@
   }
 }
 
 char ReplacePtrsWithInts::ID = 0;
 INITIALIZE_PASS(ReplacePtrsWithInts, "replace-ptrs-with-ints",
                 "Convert pointer values to integer values",
                 false, false)
 
 bool ReplacePtrsWithInts::runOnModule(Module &M) {
   DataLayout DL(&M);
+  DenseMap<const Function *, DISubprogram> FunctionDIs = makeSubprogramMap(M);
   Type *IntPtrType = DL.getIntPtrType(M.getContext());
 
   for (Module::iterator Iter = M.begin(), E = M.end(); Iter != E; ) {
     Function *OldFunc = Iter++;
     // Intrinsics' types must be left alone.
     if (OldFunc->isIntrinsic())
       continue;
 
     FunctionConverter FC(IntPtrType);
     FunctionType *NFTy = FC.convertFuncType(OldFunc->getFunctionType());
@@ skipping 37 matching lines @@
       for (BasicBlock::iterator Inst = BB->begin(), E = BB->end();
            Inst != E; ++Inst) {
         if (IntrinsicInst *Call = dyn_cast<IntrinsicInst>(Inst)) {
           if (Call->getIntrinsicID() == Intrinsic::dbg_declare) {
             ConvertMetadataOperand(&FC, Call, 0);
           }
         }
       }
     }
     FC.eraseReplacedInstructions();
+
+    // Patch the pointer to LLVM function in debug info descriptor.
+    auto DI = FunctionDIs.find(OldFunc);
+    if (DI != FunctionDIs.end())
+      DI->second.replaceFunction(NewFunc);
+
     OldFunc->eraseFromParent();
   }
   // Now that all functions have their normalized types, we can remove
   // various casts.
   for (Module::iterator Func = M.begin(), E = M.end(); Func != E; ++Func) {
     CleanUpFunction(Func, IntPtrType);
     // Delete the now-unused bitcast ConstantExprs that we created so
     // that they don't interfere with StripDeadPrototypes.
     Func->removeDeadConstantUsers();
   }
   return true;
 }
 
 ModulePass *llvm::createReplacePtrsWithIntsPass() {
   return new ReplacePtrsWithInts();
 }