[PATCH] D92335: [ThinLTO] Import symver directives for imported symbols (PR48214)

[Hans Wennborg via Phabricator via llvm-commits]

hans updated this revision to Diff 308655.
hans marked 2 inline comments as done.
hans edited the summary of this revision.
hans added a comment.

Pulling in the symver directives in IRLinker::run() instead. (I didn't do a separate function since it's just a few lines, but happy to do that if you think it would be better.)

Please take another look.


CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D92335/new/

https://reviews.llvm.org/D92335

Files:
  llvm/lib/Linker/IRMover.cpp
  llvm/test/ThinLTO/X86/Inputs/import-symver-foo.ll
  llvm/test/ThinLTO/X86/import-symver.ll


Index: llvm/test/ThinLTO/X86/import-symver.ll
===================================================================
--- /dev/null
+++ llvm/test/ThinLTO/X86/import-symver.ll
@@ -0,0 +1,21 @@
+; RUN: opt -thinlto-bc %s -o %t1.bc
+; RUN: opt -thinlto-bc %p/Inputs/import-symver-foo.ll -o %t2.bc
+; RUN: llvm-lto -thinlto-action=thinlink %t1.bc %t2.bc -o %t3.index.bc
+
+; RUN: llvm-lto -thinlto-action=import -exported-symbol=main %t1.bc -thinlto-index=%t3.index.bc
+; RUN: llvm-dis %t1.bc.thinlto.imported.bc -o - | FileCheck %s
+
+; When @bar gets imported, the symver must be imported too.
+; CHECK: module asm ".symver bar, bar at BAR_1.2.3"
+; CHECK: declare dso_local i32 @bar()
+
+target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
+target triple = "x86_64-unknown-linux-gnu"
+
+declare dso_local i32 @foo()
+
+define dso_local i32 @main() {
+entry:
+  %call = tail call i32 @foo()
+  ret i32 %call
+}
Index: llvm/test/ThinLTO/X86/Inputs/import-symver-foo.ll
===================================================================
--- /dev/null
+++ llvm/test/ThinLTO/X86/Inputs/import-symver-foo.ll
@@ -0,0 +1,12 @@
+target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
+target triple = "x86_64-unknown-linux-gnu"
+
+module asm ".symver bar, bar at BAR_1.2.3"
+
+declare dso_local i32 @bar()
+
+define dso_local i32 @foo() {
+entry:
+  %call = tail call i32 @bar()
+  ret i32 %call
+}
Index: llvm/lib/Linker/IRMover.cpp
===================================================================
--- llvm/lib/Linker/IRMover.cpp
+++ llvm/lib/Linker/IRMover.cpp
@@ -17,6 +17,7 @@
 #include "llvm/IR/GVMaterializer.h"
 #include "llvm/IR/Intrinsics.h"
 #include "llvm/IR/TypeFinder.h"
+#include "llvm/Object/ModuleSymbolTable.h"
 #include "llvm/Support/Error.h"
 #include "llvm/Transforms/Utils/Cloning.h"
 #include <utility>
@@ -1479,6 +1480,20 @@
   // are properly remapped.
   linkNamedMDNodes();
 
+  // Import symver directives.
+  if (IsPerformingImport) {
+    ModuleSymbolTable::CollectAsmSymvers(*SrcM,
+                                         [&](StringRef Name, StringRef Alias) {
+      if (DstM.getNamedValue(Name)) {
+        SmallString<256> S(".symver ");
+        S += Name;
+        S += ", ";
+        S += Alias;
+        DstM.appendModuleInlineAsm(S);
+      }
+    });
+  }
+
   // Merge the module flags into the DstM module.
   return linkModuleFlagsMetadata();
 }


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D92335.308655.patch
Type: text/x-patch
Size: 2453 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20201201/486be22c/attachment.bin>