Skip to content

Commit fd38fe4

Browse files
artemcmartemcm
authored
Merge pull request #69016 from artemcm/510FineGrainedAutolinkControls
[5.10 🍒] Fine-grained autolinking control
2 parents 533bcda + 018e680 commit fd38fe4

File tree

7 files changed

+119
-15
lines changed

7 files changed

+119
-15
lines changed

‎include/swift/AST/IRGenOptions.h

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -325,6 +325,15 @@ class IRGenOptions {
325325
/// Frameworks that we should not autolink against.
326326
SmallVector<std::string, 1> DisableAutolinkFrameworks;
327327

328+
/// Non-framework libraries that we should not autolink against.
329+
SmallVector<std::string, 1> DisableAutolinkLibraries;
330+
331+
/// Whether we should disable inserting autolink directives for any frameworks.
332+
unsigned DisableFrameworkAutolinking : 1;
333+
334+
/// Whether we should disable inserting autolink directives altogether.
335+
unsigned DisableAllAutolinking : 1;
336+
328337
/// Print the LLVM inline tree at the end of the LLVM pass pipeline.
329338
unsigned PrintInlineTree : 1;
330339

‎include/swift/Option/FrontendOptions.td

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -521,6 +521,15 @@ def code_complete_call_pattern_heuristics : Flag<["-"], "code-complete-call-patt
521521
def disable_autolink_framework : Separate<["-"],"disable-autolink-framework">,
522522
HelpText<"Disable autolinking against the provided framework">;
523523

524+
def disable_autolink_library : Separate<["-"],"disable-autolink-library">,
525+
HelpText<"Disable autolinking against the provided library">;
526+
527+
def disable_autolink_frameworks : Flag<["-"],"disable-autolink-frameworks">,
528+
HelpText<"Disable autolinking against all frameworks">;
529+
530+
def disable_all_autolinking : Flag<["-"],"disable-all-autolinking">,
531+
HelpText<"Disable all Swift autolink directives">;
532+
524533
def disable_diagnostic_passes : Flag<["-"], "disable-diagnostic-passes">,
525534
HelpText<"Don't run diagnostic passes">;
526535

‎lib/Frontend/CompilerInvocation.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2583,6 +2583,11 @@ static bool ParseIRGenArgs(IRGenOptions &Opts, ArgList &Args,
25832583
for (const Arg *A : Args.filtered(OPT_disable_autolink_framework)) {
25842584
Opts.DisableAutolinkFrameworks.push_back(A->getValue());
25852585
}
2586+
for (const Arg *A : Args.filtered(OPT_disable_autolink_library)) {
2587+
Opts.DisableAutolinkLibraries.push_back(A->getValue());
2588+
}
2589+
Opts.DisableFrameworkAutolinking = Args.hasArg(OPT_disable_autolink_frameworks);
2590+
Opts.DisableAllAutolinking = Args.hasArg(OPT_disable_all_autolinking);
25862591

25872592
Opts.GenerateProfile |= Args.hasArg(OPT_profile_generate);
25882593
const Arg *ProfileUse = Args.getLastArg(OPT_profile_use);

‎lib/IRGen/IRGenModule.cpp

Lines changed: 27 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1459,21 +1459,33 @@ void IRGenModule::addLinkLibrary(const LinkLibrary &linkLib) {
14591459
// emit it into the IR of debugger expressions.
14601460
if (Context.LangOpts.DebuggerSupport)
14611461
return;
1462-
1463-
switch (linkLib.getKind()) {
1464-
case LibraryKind::Library: {
1465-
AutolinkEntries.emplace_back(linkLib);
1466-
break;
1467-
}
1468-
case LibraryKind::Framework: {
1469-
// If we're supposed to disable autolinking of this framework, bail out.
1470-
auto &frameworks = IRGen.Opts.DisableAutolinkFrameworks;
1471-
if (std::find(frameworks.begin(), frameworks.end(), linkLib.getName())
1472-
!= frameworks.end())
1473-
return;
1474-
AutolinkEntries.emplace_back(linkLib);
1475-
break;
1476-
}
1462+
1463+
if (Context.LangOpts.hasFeature(Feature::Embedded))
1464+
return;
1465+
1466+
// '-disable-autolinking' means we will not auto-link
1467+
// any loaded library at all.
1468+
if (!IRGen.Opts.DisableAllAutolinking) {
1469+
switch (linkLib.getKind()) {
1470+
case LibraryKind::Library: {
1471+
auto &libraries = IRGen.Opts.DisableAutolinkLibraries;
1472+
if (llvm::find(libraries, linkLib.getName()) != libraries.end())
1473+
return;
1474+
AutolinkEntries.emplace_back(linkLib);
1475+
break;
1476+
}
1477+
case LibraryKind::Framework: {
1478+
// 'disable-autolink-frameworks' means we will not auto-link
1479+
// any loaded framework.
1480+
if (!IRGen.Opts.DisableFrameworkAutolinking) {
1481+
auto &frameworks = IRGen.Opts.DisableAutolinkFrameworks;
1482+
if (llvm::find(frameworks, linkLib.getName()) != frameworks.end())
1483+
return;
1484+
AutolinkEntries.emplace_back(linkLib);
1485+
}
1486+
break;
1487+
}
1488+
}
14771489
}
14781490

14791491
if (linkLib.shouldForceLoad()) {

‎test/ClangImporter/autolink-disable-all.swift

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
// RUN: %empty-directory(%t)
2+
3+
// RUN: %target-swift-frontend %s -sdk %S/Inputs -Fsystem %S/Inputs/System/Library/Frameworks -enable-objc-interop -I %S/Inputs/custom-modules -disable-all-autolinking -module-name AutolinkDisableFrameworks -emit-ir -o %t/test.ll
4+
// RUN: cat %t/test.ll | %FileCheck %s
5+
6+
// Linux uses a different autolinking mechanism, based on
7+
// swift-autolink-extract. This file tests the Darwin mechanism.
8+
// UNSUPPORTED: autolink-extract
9+
10+
import LinkMusket
11+
import LinkFramework
12+
import ClangModuleUser
13+
import IndirectFrameworkImporter
14+
import UsesSubmodule
15+
16+
// No linker options produced
17+
// CHECK: !llvm.linker.options = !{}

‎test/ClangImporter/autolink-disable-frameworks.swift

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
// RUN: %empty-directory(%t)
2+
3+
// RUN: %target-swift-frontend %s -sdk %S/Inputs -Fsystem %S/Inputs/System/Library/Frameworks -enable-objc-interop -I %S/Inputs/custom-modules -disable-autolink-frameworks -module-name AutolinkDisableFrameworks -emit-ir -o %t/test.ll
4+
// RUN: cat %t/test.ll | %FileCheck %s
5+
6+
// Linux uses a different autolinking mechanism, based on
7+
// swift-autolink-extract. This file tests the Darwin mechanism.
8+
// UNSUPPORTED: autolink-extract
9+
10+
import LinkMusket
11+
import LinkFramework
12+
import ClangModuleUser
13+
import IndirectFrameworkImporter
14+
import UsesSubmodule
15+
16+
// CHECK: !llvm.linker.options = !{
17+
18+
// CHECK-DAG: !{{[0-9]+}} = !{!{{"-lLock"|"/DEFAULTLIB:Lock.lib"}}}
19+
// CHECK-DAG: !{{[0-9]+}} = !{!{{"-lStock"|"/DEFAULTLIB:Stock.lib"}}}
20+
// CHECK-DAG: !{{[0-9]+}} = !{!{{"-lUnderlyingClangLibrary"|"/DEFAULTLIB:UnderlyingClangLibrary.lib"}}}
21+
22+
// CHECK-NOT: !{!"-framework", !"Barrel"}
23+
// CHECK-NOT: !{!"-framework", !"LinkFramework"}
24+
// CHECK-NOT: !{!"-framework", !"Indirect"}
25+
// CHECK-NOT: !{!"-framework", !"HasSubmodule"}
26+
// CHECK-NOT: !{!"-framework", !"Barrel"}
27+
// CHECK-NOT: !{!"-framework", !"Indirect"}

‎test/ClangImporter/autolink-disable-library.swift

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
// RUN: %empty-directory(%t)
2+
3+
// RUN: %target-swift-frontend %s -sdk %S/Inputs -Fsystem %S/Inputs/System/Library/Frameworks -enable-objc-interop -I %S/Inputs/custom-modules -disable-autolink-library Stock -disable-autolink-library UnderlyingClangLibrary -module-name AutolinkDisableFrameworks -emit-ir -o %t/test.ll
4+
// RUN: cat %t/test.ll | %FileCheck %s
5+
6+
// Linux uses a different autolinking mechanism, based on
7+
// swift-autolink-extract. This file tests the Darwin mechanism.
8+
// UNSUPPORTED: autolink-extract
9+
10+
import LinkMusket
11+
import LinkFramework
12+
import ClangModuleUser
13+
import IndirectFrameworkImporter
14+
import UsesSubmodule
15+
16+
// CHECK: !llvm.linker.options = !{
17+
18+
// CHECK-DAG: !{{[0-9]+}} = !{!{{"-lLock"|"/DEFAULTLIB:Lock.lib"}}}
19+
// CHECK-DAG: !{{[0-9]+}} = !{!"-framework", !"Barrel"}
20+
// CHECK-DAG: !{{[0-9]+}} = !{!"-framework", !"LinkFramework"}
21+
// CHECK-DAG: !{{[0-9]+}} = !{!"-framework", !"Indirect"}
22+
// CHECK-DAG: !{{[0-9]+}} = !{!"-framework", !"HasSubmodule"}
23+
24+
// CHECK-NOT: !{!{{"-lStock"|"/DEFAULTLIB:Stock.lib"}}}
25+
// CHECK-NOT: !{!{{"-lUnderlyingClangLibrary"|"/DEFAULTLIB:UnderlyingClangLibrary.lib"}}}

0 commit comments

Comments
 (0)