[PATCH] D103990: [lld/mac] When handling @loader_path, use realpath() of symlinks

[Nico Weber via Phabricator via llvm-commits]

thakis created this revision.
thakis added a reviewer: lld-macho.
Herald added a reviewer: int3.
Herald added a reviewer: gkm.
Herald added a project: lld-macho.
thakis requested review of this revision.

This is important for Frameworks, which are usually symlinks.

ld64 gets this right for @rpath that's replaced with @loader_path, but not for
bare @loader_path -- ld64's code calls realpath() in that case too, but ignores
the result.

ld64 somehow manages to find libbar1.dylib in the test without the
explicit `-rpath` in Foo1. I don't understand why or how. But this
change is a step forward and fixes an immediate problem I'm having,
so let's start with this :)


https://reviews.llvm.org/D103990

Files:
  lld/MachO/InputFiles.cpp
  lld/test/MachO/link-search-at-loader-path-symlink.s


Index: lld/test/MachO/link-search-at-loader-path-symlink.s
===================================================================
--- /dev/null
+++ lld/test/MachO/link-search-at-loader-path-symlink.s
@@ -0,0 +1,57 @@
+# REQUIRES: x86, shell
+
+# RUN: rm -rf %t; split-file %s %t
+
+# RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %t/foo.s -o %t/foo.o
+# RUN: llvm-mc -filetype obj -triple x86_64-apple-darwin %t/bar.s -o %t/bar.o
+# RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %t/test.s -o %t/test.o
+
+## 1. Test symlink with reexport to @rpath and rpath pointing to @loader_path.
+## The @loader_path-relative path is looked after resolving the symlink.
+
+# RUN: mkdir -p %t/Foo1.framework/Versions/A
+# RUN: %lld -dylib -install_name @rpath/libbar1.dylib %t/bar.o -o %t/Foo1.framework/Versions/A/libbar1.dylib
+
+# RUN: %lld -dylib -install_name %t/Foo1.framework/Versions/A/Foo1 %t/foo.o \
+# RUN:     -reexport_library %t/Foo1.framework/Versions/A/libbar1.dylib \
+# RUN:     -rpath @loader_path/. \
+# RUN:     -o %t/Foo1.framework/Versions/A/Foo1
+# RUN: ln -sf A %t/Foo1.framework/Versions/Current
+# RUN: ln -sf Versions/Current/Foo1 %t/Foo1.framework/Foo1
+
+# RUN: %lld -lSystem -F%t -framework Foo1 %t/test.o -o %t/test1
+
+## 2. Test symlink with reexport to @loader_path-relative path directly..
+## The @loader_path-relative path is looked after resolving the symlink.
+## ld64 gets this wrong -- it calls realpath() but ignores the result.
+## (ld64-609, Options.cpp, Options::findFile(), "@loader_path/" handling.)
+
+# RUN: mkdir -p %t/Foo2.framework/Versions/A
+# RUN: %lld -dylib -install_name @loader_path/libbar2.dylib %t/bar.o -o %t/Foo2.framework/Versions/A/libbar2.dylib
+
+# RUN: %lld -dylib -install_name %t/Foo2.framework/Versions/A/Foo2 %t/foo.o \
+# RUN:     -reexport_library %t/Foo2.framework/Versions/A/libbar2.dylib \
+# RUN:     -o %t/Foo2.framework/Versions/A/Foo2
+# RUN: ln -sf A %t/Foo2.framework/Versions/Current
+# RUN: ln -sf Versions/Current/Foo2 %t/Foo2.framework/Foo2
+
+# RUN: %lld -lSystem -F%t -framework Foo2 %t/test.o -o %t/test2
+
+#--- foo.s
+.globl _foo
+_foo:
+  ret
+
+#--- bar.s
+.globl _bar
+_bar:
+  ret
+
+#--- test.s
+.globl _main
+.text
+_main:
+  callq _foo
+  callq _bar
+  ret
+
Index: lld/MachO/InputFiles.cpp
===================================================================
--- lld/MachO/InputFiles.cpp
+++ lld/MachO/InputFiles.cpp
@@ -788,16 +788,21 @@
       path.consume_front("@executable_path/")) {
     // ld64 allows overriding this with the undocumented flag -executable_path.
     // lld doesn't currently implement that flag.
-    path::append(newPath, sys::path::parent_path(config->outputFile), path);
+    path::append(newPath, path::parent_path(config->outputFile), path);
     path = newPath;
   } else if (path.consume_front("@loader_path/")) {
-    path::append(newPath, sys::path::parent_path(umbrella->getName()), path);
+    fs::real_path(umbrella->getName(), newPath);
+    path::remove_filename(newPath);
+    path::append(newPath, path);
     path = newPath;
+
   } else if (path.startswith("@rpath/")) {
     for (StringRef rpath : umbrella->rpaths) {
       newPath.clear();
-      if (rpath.consume_front("@loader_path/"))
-        path::append(newPath, sys::path::parent_path(umbrella->getName()));
+      if (rpath.consume_front("@loader_path/")) {
+        fs::real_path(umbrella->getName(), newPath);
+        path::remove_filename(newPath);
+      }
       path::append(newPath, rpath, path.drop_front(strlen("@rpath/")));
       if (Optional<std::string> dylibPath = resolveDylibPath(newPath))
         return loadDylib(*dylibPath, umbrella);


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D103990.350986.patch
Type: text/x-patch
Size: 3662 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20210609/e3a8e6e4/attachment.bin>