From 3aa8e071dd1ae7e9fb9e28fa9fcdb9f9fdb7aa06 Mon Sep 17 00:00:00 2001 From: Jez Ng Date: Tue, 15 Dec 2020 00:49:03 -0500 Subject: [PATCH] [lld-macho] Add implicit dylib support for frameworks {D93000} applied to frameworks. Partial fix for PR48511. Reviewed By: #lld-macho, thakis Differential Revision: https://reviews.llvm.org/D93277 --- lld/MachO/InputFiles.cpp | 13 ++++++-- lld/test/MachO/implicit-dylibs.s | 53 +++++++++++++++++++++++++++++++- 2 files changed, 62 insertions(+), 4 deletions(-) diff --git a/lld/MachO/InputFiles.cpp b/lld/MachO/InputFiles.cpp index 4bf568284c54..78c3dc9b7a52 100644 --- a/lld/MachO/InputFiles.cpp +++ b/lld/MachO/InputFiles.cpp @@ -508,9 +508,16 @@ static bool isImplicitlyLinked(StringRef path) { if (!config->implicitDylibs) return false; - return path::parent_path(path) == "/usr/lib"; - // TODO: check for public frameworks too. We'll need to implement - // -sub_umbrella first to write a test case. + if (path::parent_path(path) == "/usr/lib") + return true; + + // Match /System/Library/Frameworks/$FOO.framework/**/$FOO + if (path.consume_front("/System/Library/Frameworks/")) { + StringRef frameworkName = path.take_until([](char c) { return c == '.'; }); + return path::filename(path) == frameworkName; + } + + return false; } void loadReexport(StringRef path, DylibFile *umbrella) { diff --git a/lld/test/MachO/implicit-dylibs.s b/lld/test/MachO/implicit-dylibs.s index 21084b50006b..bd2d6e8d104b 100644 --- a/lld/test/MachO/implicit-dylibs.s +++ b/lld/test/MachO/implicit-dylibs.s @@ -3,10 +3,16 @@ # UNSUPPORTED: system-windows # RUN: rm -rf %t; split-file %s %t # RUN: mkdir -p %t/usr/lib/system +# RUN: mkdir -p %t/System/Library/Frameworks/Foo.framework/Versions/A +# RUN: mkdir -p %t/System/Library/Frameworks/Foo.framework/Frameworks/Bar.framework/Versions/A +# RUN: mkdir -p %t/Baz.framework/Versions/A # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %t/libfoo.s -o %t/libfoo.o # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %t/libtoplevel.s -o %t/libtoplevel.o # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %t/libsublevel.s -o %t/libsublevel.o +# RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %t/framework-foo.s -o %t/framework-foo.o +# RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %t/framework-bar.s -o %t/framework-bar.o +# RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %t/framework-baz.s -o %t/framework-baz.o ## libunused will be used to verify that we load implicit dylibs even if we ## don't use any symbols they contain. # RUN: echo "" | llvm-mc -filetype=obj -triple=x86_64-apple-darwin -o %t/libunused.o @@ -16,10 +22,28 @@ # RUN: %lld -dylib -lSystem %t/libtoplevel.o -o %t/usr/lib/libtoplevel.dylib -install_name /usr/lib/libtoplevel.dylib # RUN: %lld -dylib -lSystem %t/libsublevel.o -o %t/usr/lib/system/libsublevel.dylib -install_name /usr/lib/system/libsublevel.dylib # RUN: %lld -dylib -lSystem %t/libunused.o -o %t/usr/lib/libunused.dylib -install_name /usr/lib/libunused.dylib -# RUN: %lld -dylib -syslibroot %t \ + +## Bar.framework is nested within Foo.framework. +# RUN: %lld -dylib -lSystem %t/framework-baz.o -o %t/System/Library/Frameworks/Foo.framework/Frameworks/Bar.framework/Versions/A/Bar \ +# RUN: -install_name /System/Library/Frameworks/Foo.framework/Frameworks/Bar.framework/Versions/A/Bar +# RUN: ln -sf %t/System/Library/Frameworks/Foo.framework/Frameworks/Bar.framework/Versions/A/Bar \ +# RUN: %t/System/Library/Frameworks/Foo.framework/Frameworks/Bar.framework/Bar + +## Have Foo re-export Bar. +# RUN: %lld -dylib -F %t/System/Library/Frameworks/Foo.framework/Frameworks \ +# RUN: -framework Bar -sub_umbrella Bar -lSystem %t/framework-foo.o -o %t/System/Library/Frameworks/Foo.framework/Versions/A/Foo \ +# RUN: -install_name /System/Library/Frameworks/Foo.framework/Versions/A/Foo +# RUN: ln -sf %t/System/Library/Frameworks/Foo.framework/Versions/A/Foo %t/System/Library/Frameworks/Foo.framework/Foo + +# RUN: %lld -dylib -lSystem %t/framework-bar.o -o %t/Baz.framework/Versions/A/Baz \ +# RUN: -install_name %t/Baz.framework/Versions/A/Baz +# RUN: ln -sf %t/Baz.framework/Versions/A/Baz %t/Baz.framework/Baz + +# RUN: %lld -dylib -syslibroot %t -framework Foo -F %t -framework Baz \ # RUN: -lc++ -ltoplevel -lunused %t/usr/lib/system/libsublevel.dylib %t/libfoo.dylib \ # RUN: -sub_library libc++ -sub_library libfoo -sub_library libtoplevel \ # RUN: -sub_library libsublevel -sub_library libunused \ +# RUN: -sub_umbrella Baz -sub_umbrella Foo \ # RUN: %t/reexporter.o -o %t/libreexporter.dylib # RUN: llvm-mc -filetype obj -triple x86_64-apple-darwin %t/test.s -o %t/test.o @@ -29,6 +53,9 @@ # CHECK-DAG: __DATA __data {{.*}} pointer 0 libreexporter _foo # CHECK-DAG: __DATA __data {{.*}} pointer 0 libtoplevel _toplevel # CHECK-DAG: __DATA __data {{.*}} pointer 0 libreexporter _sublevel +# CHECK-DAG: __DATA __data {{.*}} pointer 0 Foo _framework_foo +# CHECK-DAG: __DATA __data {{.*}} pointer 0 libreexporter _framework_bar +# CHECK-DAG: __DATA __data {{.*}} pointer 0 libreexporter _framework_baz # CHECK-DAG: __DATA __data {{.*}} pointer 0 libc++abi ___gxx_personality_v0 # RUN: llvm-objdump --macho --all-headers %t/test | FileCheck %s \ @@ -43,6 +70,9 @@ # LOAD-NEXT: name /usr/lib/libSystem.B.dylib # LOAD: cmd LC_LOAD_DYLIB # LOAD-NEXT: cmdsize +# LOAD-NEXT: name /System/Library/Frameworks/Foo.framework/Versions/A/Foo +# LOAD: cmd LC_LOAD_DYLIB +# LOAD-NEXT: cmdsize # LOAD-NEXT: name /usr/lib/libc++abi.dylib # LOAD: cmd LC_LOAD_DYLIB # LOAD-NEXT: cmdsize @@ -63,6 +93,9 @@ # NO-IMPLICIT-DAG: __DATA __data {{.*}} pointer 0 libreexporter _foo # NO-IMPLICIT-DAG: __DATA __data {{.*}} pointer 0 libreexporter _toplevel # NO-IMPLICIT-DAG: __DATA __data {{.*}} pointer 0 libreexporter _sublevel +# NO-IMPLICIT-DAG: __DATA __data {{.*}} pointer 0 libreexporter _framework_foo +# NO-IMPLICIT-DAG: __DATA __data {{.*}} pointer 0 libreexporter _framework_bar +# NO-IMPLICIT-DAG: __DATA __data {{.*}} pointer 0 libreexporter _framework_baz # NO-IMPLICIT-DAG: __DATA __data {{.*}} pointer 0 libreexporter ___gxx_personality_v0 #--- libfoo.s @@ -80,6 +113,21 @@ _toplevel: .globl _sublevel _sublevel: +#--- framework-foo.s +.data +.globl _framework_foo +_framework_foo: + +#--- framework-bar.s +.data +.globl _framework_bar +_framework_bar: + +#--- framework-baz.s +.data +.globl _framework_baz +_framework_baz: + #--- test.s .text .globl _main @@ -91,4 +139,7 @@ _main: .quad _foo .quad _toplevel .quad _sublevel + .quad _framework_foo + .quad _framework_bar + .quad _framework_baz .quad ___gxx_personality_v0