[llvm] r252319 - Restore "Move metadata linking after lazy global materialization/linking."

[Teresa Johnson via llvm-commits]

Author: tejohnson
Date: Fri Nov  6 11:50:48 2015
New Revision: 252319

URL: http://llvm.org/viewvc/llvm-project?rev=252319&view=rev
Log:
Restore "Move metadata linking after lazy global materialization/linking."

This reverts commit r251965.

Added:
    llvm/trunk/test/Linker/Inputs/only-needed-named-metadata.ll
    llvm/trunk/test/Linker/only-needed-named-metadata.ll
Modified:
    llvm/trunk/lib/Linker/LinkModules.cpp

Modified: llvm/trunk/lib/Linker/LinkModules.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Linker/LinkModules.cpp?rev=252319&r1=252318&r2=252319&view=diff
==============================================================================
--- llvm/trunk/lib/Linker/LinkModules.cpp (original)
+++ llvm/trunk/lib/Linker/LinkModules.cpp Fri Nov  6 11:50:48 2015
@@ -1892,15 +1892,6 @@ bool ModuleLinker::run() {
     linkGlobalValueBody(Src);
   }
 
-  // Remap all of the named MDNodes in Src into the DstM module. We do this
-  // after linking GlobalValues so that MDNodes that reference GlobalValues
-  // are properly remapped.
-  linkNamedMDNodes();
-
-  // Merge the module flags into the DstM module.
-  if (linkModuleFlagsMetadata())
-    return true;
-
   // Update the initializers in the DstM module now that all globals that may
   // be referenced are in DstM.
   for (GlobalVariable &Src : SrcM->globals()) {
@@ -1927,6 +1918,15 @@ bool ModuleLinker::run() {
       return true;
   }
 
+  // Remap all of the named MDNodes in Src into the DstM module. We do this
+  // after linking GlobalValues so that MDNodes that reference GlobalValues
+  // are properly remapped.
+  linkNamedMDNodes();
+
+  // Merge the module flags into the DstM module.
+  if (linkModuleFlagsMetadata())
+    return true;
+
   return false;
 }
 

Added: llvm/trunk/test/Linker/Inputs/only-needed-named-metadata.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/Inputs/only-needed-named-metadata.ll?rev=252319&view=auto
==============================================================================
--- llvm/trunk/test/Linker/Inputs/only-needed-named-metadata.ll (added)
+++ llvm/trunk/test/Linker/Inputs/only-needed-named-metadata.ll Fri Nov  6 11:50:48 2015
@@ -0,0 +1,9 @@
+ at X = external global i32
+
+declare i32 @foo()
+
+define void @bar() {
+	load i32, i32* @X
+	call i32 @foo()
+	ret void
+}

Added: llvm/trunk/test/Linker/only-needed-named-metadata.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/only-needed-named-metadata.ll?rev=252319&view=auto
==============================================================================
--- llvm/trunk/test/Linker/only-needed-named-metadata.ll (added)
+++ llvm/trunk/test/Linker/only-needed-named-metadata.ll Fri Nov  6 11:50:48 2015
@@ -0,0 +1,16 @@
+; RUN: llvm-as %S/only-needed-named-metadata.ll -o %t.bc
+; RUN: llvm-as %S/Inputs/only-needed-named-metadata.ll -o %t2.bc
+; RUN: llvm-link -S -only-needed %t2.bc %t.bc | FileCheck %s
+; RUN: llvm-link -S -internalize -only-needed %t2.bc %t.bc | FileCheck %s
+
+; CHECK: @U = external global i32
+; CHECK: declare i32 @unused()
+
+ at X = global i32 5
+ at U = global i32 6
+define i32 @foo() { ret i32 7 }
+define i32 @unused() { ret i32 8 }
+
+!llvm.named = !{!0, !1}
+!0 = !{i32 ()* @unused}
+!1 = !{i32* @U}