Pull method symbols over when linking. Otherwise the result of the link will appear...

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@1033 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Linker/LinkModules.cpp b/lib/Linker/LinkModules.cpp
index 3e8a35cde4ec8830ce2b138875fa007a1d109fd7..3cb1ffecd265286b788d5ff57cdac0ae17061490 100644 (file)
--- a/lib/Linker/LinkModules.cpp
+++ b/lib/Linker/LinkModules.cpp
@@ -260,6 +260,7 @@ static bool LinkMethodBody(Method *Dest, const Method *Src,
          II != IE; ++II) {
       const Instruction *SI = *II;
       Instruction *DI = SI->clone();
+      DI->setName(SI->getName());
       DBB->getInstList().push_back(DI);
       LocalMap.insert(make_pair(SI, DI));
     }

diff --git a/lib/Transforms/Utils/Linker.cpp b/lib/Transforms/Utils/Linker.cpp
index 3e8a35cde4ec8830ce2b138875fa007a1d109fd7..3cb1ffecd265286b788d5ff57cdac0ae17061490 100644 (file)
--- a/lib/Transforms/Utils/Linker.cpp
+++ b/lib/Transforms/Utils/Linker.cpp
@@ -260,6 +260,7 @@ static bool LinkMethodBody(Method *Dest, const Method *Src,
          II != IE; ++II) {
       const Instruction *SI = *II;
       Instruction *DI = SI->clone();
+      DI->setName(SI->getName());
       DBB->getInstList().push_back(DI);
       LocalMap.insert(make_pair(SI, DI));
     }

diff --git a/lib/VMCore/Linker.cpp b/lib/VMCore/Linker.cpp
index 3e8a35cde4ec8830ce2b138875fa007a1d109fd7..3cb1ffecd265286b788d5ff57cdac0ae17061490 100644 (file)
--- a/lib/VMCore/Linker.cpp
+++ b/lib/VMCore/Linker.cpp
@@ -260,6 +260,7 @@ static bool LinkMethodBody(Method *Dest, const Method *Src,
          II != IE; ++II) {
       const Instruction *SI = *II;
       Instruction *DI = SI->clone();
+      DI->setName(SI->getName());
       DBB->getInstList().push_back(DI);
       LocalMap.insert(make_pair(SI, DI));
     }