1 files changed, 1 insertions, 21 deletions
diff --git a/lib/Linker/LinkModules.cpp b/lib/Linker/LinkModules.cpp
index 26061c280d..2fdb8cc9cd 100644
--- a/lib/Linker/LinkModules.cpp
+++ b/lib/Linker/LinkModules.cpp
@@ -927,19 +927,6 @@ void ModuleLinker::linkFunctionBody(Function *Dst, Function *Src) {
     ValueMap[I] = DI;
   }
 
-  // @LOCALMOD-BEGIN
-  // Local patch for http://llvm.org/bugs/show_bug.cgi?id=11112
-  // and http://llvm.org/bugs/show_bug.cgi?id=10887
-  // Create an identity mapping for instructions so that alloca instructions
-  // do not get dropped and related debug info isn't lost.  E.g., prevent
-  //   call @llvm.dbg.declare(metadata !{i32 * %local_var}, ...)
-  // from becoming
-  //   call @llvm.dbg.declare(null, ...)
-  for (Function::iterator BB = Src->begin(), BE = Src->end(); BB != BE; ++BB)
-    for (BasicBlock::iterator I = BB->begin(), E = BB->end(); I != E; ++I)
-      ValueMap[I] = I;
-  // @LOCALMOD-END
-
   if (Mode == Linker::DestroySource) {
     // Splice the body of the source function into the dest function.
     Dst->getBasicBlockList().splice(Dst->end(), Src->getBasicBlockList());
@@ -958,13 +945,6 @@ void ModuleLinker::linkFunctionBody(Function *Dst, Function *Src) {
     CloneFunctionInto(Dst, Src, ValueMap, false, Returns, "", NULL, &TypeMap);
   }
 
-  // @LOCALMOD-BEGIN
-  // There is no need for the identity mapping anymore.
-  for (Function::iterator BB = Src->begin(), BE = Src->end(); BB != BE; ++BB)
-    for (BasicBlock::iterator I = BB->begin(), E = BB->end(); I != E; ++I)
-      ValueMap.erase(I);
-  // @LOCALMOD-END
-  
   // There is no need to map the arguments anymore.
   for (Function::arg_iterator I = Src->arg_begin(), E = Src->arg_end();
        I != E; ++I)
@@ -1195,7 +1175,7 @@ bool ModuleLinker::run() {
   for (Module::lib_iterator SI = SrcM->lib_begin(), SE = SrcM->lib_end();
        SI != SE; ++SI)
     DstM->addLibrary(*SI);
-  
+
   // If the source library's module id is in the dependent library list of the
   // destination library, remove it since that module is now linked in.
   StringRef ModuleId = SrcM->getModuleIdentifier();