[PATCH] D15156: [ThinLTO] Appending linkage fixes

[Teresa Johnson via llvm-commits]

tejohnson updated this revision to Diff 41649.
tejohnson added a comment.

- Change test to be llvm-link based.


http://reviews.llvm.org/D15156

Files:
  lib/Linker/LinkModules.cpp
  test/Linker/Inputs/funcimport_appending_global.ll
  test/Linker/funcimport_appending_global.ll

Index: test/Linker/funcimport_appending_global.ll
===================================================================
--- /dev/null
+++ test/Linker/funcimport_appending_global.ll
@@ -0,0 +1,18 @@
+; RUN: llvm-as -function-summary %s -o %t.bc
+; RUN: llvm-as -function-summary %p/Inputs/funcimport_appending_global.ll -o %t2.bc
+; RUN: llvm-lto -thinlto -o %t3 %t.bc %t2.bc
+
+; Do the import now
+; RUN: llvm-link %t.bc -functionindex=%t3.thinlto.bc -import=foo:%t2.bc -S | FileCheck %s
+
+; Ensure that global constructors (appending linkage) is not imported
+; CHECK-NOT: @llvm.global_ctors
+
+
+define i32 @main() {
+entry:
+  call void @foo()
+  ret i32 0
+}
+
+declare void @foo()
Index: test/Linker/Inputs/funcimport_appending_global.ll
===================================================================
--- /dev/null
+++ test/Linker/Inputs/funcimport_appending_global.ll
@@ -0,0 +1,6 @@
+ at v = weak global i8 1
+ at llvm.global_ctors = appending global [1 x { i32, void ()*, i8* }] [{ i32, void ()*, i8* } { i32 65535, void ()* @foo, i8* @v}]
+
+define void @foo() {
+  ret void
+}
Index: lib/Linker/LinkModules.cpp
===================================================================
--- lib/Linker/LinkModules.cpp
+++ lib/Linker/LinkModules.cpp
@@ -762,8 +762,10 @@
     // It would be incorrect to import an appending linkage variable,
     // since it would cause global constructors/destructors to be
     // executed multiple times. This should have already been handled
-    // by linkGlobalValueProto.
-    llvm_unreachable("Cannot import appending linkage variable");
+    // by linkGlobalValueProto, and we will assert in shouldLinkFromSource
+    // if we try to import, so we simply return AppendingLinkage here
+    // as this helper is called more widely in getLinkedToGlobal.
+    return GlobalValue::AppendingLinkage;
 
   case GlobalValue::InternalLinkage:
   case GlobalValue::PrivateLinkage:
@@ -1861,7 +1863,8 @@
 
   if (!DGV && !shouldOverrideFromSrc() &&
       (GV.hasLocalLinkage() || GV.hasLinkOnceLinkage() ||
-       GV.hasAvailableExternallyLinkage())) {
+       GV.hasAvailableExternallyLinkage() ||
+       (GV.hasAppendingLinkage() && isPerformingImport()))) {
     return false;
   }
   MapValue(&GV, ValueMap, RF_MoveDistinctMDs, &TypeMap, &ValMaterializer);


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D15156.41649.patch
Type: text/x-patch
Size: 2296 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20151202/3e953bd0/attachment.bin>