[llvm] 059f044 - [ORC] Propagate weak & hidden flags when creating lazy reexports, redirectables.

[Lang Hames via llvm-commits]

Author: Lang Hames
Date: 2025-02-18T22:18:34+11:00
New Revision: 059f044309a282447fb25073875cff8d2bd96f78

URL: https://github.com/llvm/llvm-project/commit/059f044309a282447fb25073875cff8d2bd96f78
DIFF: https://github.com/llvm/llvm-project/commit/059f044309a282447fb25073875cff8d2bd96f78.diff

LOG: [ORC] Propagate weak & hidden flags when creating lazy reexports, redirectables.

Updates JITLinkRedirectableSymbolManager to take alias flags into account when
setting the scope and linkage of the created stubs (weak aliases get now get weak
linkage, hidden stubs get hidden visibility).

Updates lazyReexports to propagate alias flags (rather than trampoline flags)
when building the initial destinations map for the redirectable symbols manager.

Together these changes allow the LazyObjectLinkingLayer to link objects
containing weak and hidden symbols.

Added: 
    compiler-rt/test/orc/TestCases/Generic/Inputs/bar-ret-void-weak.ll
    compiler-rt/test/orc/TestCases/Generic/Inputs/baz-ret-void-hidden.ll

Modified: 
    compiler-rt/test/orc/TestCases/Generic/lazy-link.ll
    llvm/lib/ExecutionEngine/Orc/JITLinkRedirectableSymbolManager.cpp
    llvm/lib/ExecutionEngine/Orc/LazyReexports.cpp

Removed: 
    


################################################################################
diff  --git a/compiler-rt/test/orc/TestCases/Generic/Inputs/bar-ret-void-weak.ll b/compiler-rt/test/orc/TestCases/Generic/Inputs/bar-ret-void-weak.ll
new file mode 100644
index 0000000000000..7301b43e7c92d
--- /dev/null
+++ b/compiler-rt/test/orc/TestCases/Generic/Inputs/bar-ret-void-weak.ll
@@ -0,0 +1,4 @@
+define weak void @bar()  {
+entry:
+  ret void
+}

diff  --git a/compiler-rt/test/orc/TestCases/Generic/Inputs/baz-ret-void-hidden.ll b/compiler-rt/test/orc/TestCases/Generic/Inputs/baz-ret-void-hidden.ll
new file mode 100644
index 0000000000000..27e19deea6ebd
--- /dev/null
+++ b/compiler-rt/test/orc/TestCases/Generic/Inputs/baz-ret-void-hidden.ll
@@ -0,0 +1,4 @@
+define hidden void @baz()  {
+entry:
+  ret void
+}

diff  --git a/compiler-rt/test/orc/TestCases/Generic/lazy-link.ll b/compiler-rt/test/orc/TestCases/Generic/lazy-link.ll
index 5a8dbfc532b0f..1c375bcf1e62f 100644
--- a/compiler-rt/test/orc/TestCases/Generic/lazy-link.ll
+++ b/compiler-rt/test/orc/TestCases/Generic/lazy-link.ll
@@ -6,9 +6,11 @@
 ; RUN: rm -rf %t && mkdir -p %t
 ; RUN: %clang -c -o %t/foo.o %S/Inputs/foo-ret-42.ll
 ; RUN: %clang -c -o %t/x.o %S/Inputs/var-x-42.ll
+; RUN: %clang -c -o %t/bar.o %S/Inputs/bar-ret-void-weak.ll
+; RUN: %clang -c -o %t/baz.o %S/Inputs/baz-ret-void-hidden.ll
 ; RUN: %clang -c -o %t/main.o %s
 ; RUN: %llvm_jitlink -noexec -show-linked-files %t/main.o -lazy %t/foo.o \
-; RUN:     -lazy %t/x.o | FileCheck %s
+; RUN:     -lazy %t/x.o -lazy %t/bar.o -lazy %t/baz.o | FileCheck %s
 ;
 ; UNSUPPORTED: system-windows
 ; REQUIRES: target={{(arm|aarch|x86_)64.*}}
@@ -21,9 +23,15 @@
 declare i32 @foo()
 @x = external global i32
 
+declare void @bar()
+declare hidden void @baz()
+
+
 define i32 @main(i32 %argc, ptr %argv) {
 entry:
   %foo_result = call i32 @foo()
+  call void @bar()
+  call void @baz()
   %x_val = load i32, ptr @x
   %result = add nsw i32 %foo_result, %x_val
   ret i32 %result

diff  --git a/llvm/lib/ExecutionEngine/Orc/JITLinkRedirectableSymbolManager.cpp b/llvm/lib/ExecutionEngine/Orc/JITLinkRedirectableSymbolManager.cpp
index 06c545d62d76a..b5b380971d204 100644
--- a/llvm/lib/ExecutionEngine/Orc/JITLinkRedirectableSymbolManager.cpp
+++ b/llvm/lib/ExecutionEngine/Orc/JITLinkRedirectableSymbolManager.cpp
@@ -47,7 +47,10 @@ void JITLinkRedirectableSymbolManager::emitRedirectableSymbols(
     Ptr.setScope(jitlink::Scope::Hidden);
     auto &Stub = PtrJumpStubCreator(*G, StubsSection, Ptr);
     Stub.setName(Name);
-    Stub.setScope(jitlink::Scope::Default);
+    Stub.setScope(Def.getFlags().isExported() ? jitlink::Scope::Default
+                                              : jitlink::Scope::Hidden);
+    Stub.setLinkage(!Def.getFlags().isWeak() ? jitlink::Linkage::Strong
+                                             : jitlink::Linkage::Weak);
     NewSymbols[std::move(PtrName)] = JITSymbolFlags();
   }
 

diff  --git a/llvm/lib/ExecutionEngine/Orc/LazyReexports.cpp b/llvm/lib/ExecutionEngine/Orc/LazyReexports.cpp
index 7b38621eba824..80f2a1304dde7 100644
--- a/llvm/lib/ExecutionEngine/Orc/LazyReexports.cpp
+++ b/llvm/lib/ExecutionEngine/Orc/LazyReexports.cpp
@@ -387,7 +387,7 @@ void LazyReexportsManager::emitRedirectableSymbols(
   SymbolMap Redirs;
   size_t I = 0;
   for (auto &[Name, AI] : Reexports)
-    Redirs[Name] = (*ReentryPoints)[I++];
+    Redirs[Name] = {(*ReentryPoints)[I++].getAddress(), AI.AliasFlags};
 
   I = 0;
   if (!Reexports.empty()) {