averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Driver: do not generate a dSYM bundle for static archives

Browse Source 
When building a static library with debug information, do not create a
dSYM generation job as it cannot be executed on a non-image target.
This is important for the case where the single invocation is both the
compile and link job.

This was detected in conjunction with @gottesmm.
This commit is contained in:
Saleem Abdulrasool
2021-05-19 20:57:26 -07:00
parent f69dfc2e9a
commit 1f11627f09
2 changed files with 33 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
lib/Driver/Driver.cpp
View File

@@ -2222,13 +2222,25 @@ void Driver::buildActions(SmallVectorImpl<const Action *> &TopLevelActions,
}
TopLevelActions.push_back(LinkAction);
if (TC.getTriple().isOSDarwin() &&
OI.DebugInfoLevel > IRGenDebugInfoLevel::None) {
auto *dSYMAction = C.createAction<GenerateDSYMJobAction>(LinkAction);
TopLevelActions.push_back(dSYMAction);
if (Args.hasArg(options::OPT_verify_debug_info)) {
TopLevelActions.push_back(
C.createAction<VerifyDebugInfoJobAction>(dSYMAction));
if (TC.getTriple().isOSDarwin()) {
switch (OI.LinkAction) {
case LinkKind::Executable:
case LinkKind::DynamicLibrary:
if (OI.DebugInfoLevel > IRGenDebugInfoLevel::None) {
auto *dSYMAction = C.createAction<GenerateDSYMJobAction>(LinkAction);
TopLevelActions.push_back(dSYMAction);
if (Args.hasArg(options::OPT_verify_debug_info)) {
TopLevelActions.push_back(
C.createAction<VerifyDebugInfoJobAction>(dSYMAction));
}
}
break;
case LinkKind::None:
LLVM_FALLTHROUGH;
case LinkKind::StaticLibrary:
// Cannot build the DSYM bundle for non-image targets.
break;
}
}
} else {

14
test/Driver/darwin-static-library-debug.swift Normal file
View File

@@ -0,0 +1,14 @@
// RUN: %swiftc_driver -driver-print-actions -target x86_64-apple-macosx10.15 -g -emit-library -static -o library.a %s 2>&1 | %FileCheck %s -check-prefix CHECK -check-prefix CHECK-STATIC
// RUN: %swiftc_driver -driver-print-actions -target x86_64-apple-macosx10.15 -g -emit-library -o library.a %s 2>&1 | %FileCheck %s -check-prefix CHECK -check-prefix CHECK-SHARED
// RUN: %swiftc_driver -driver-print-actions -target x86_64-apple-macosx10.15 -g -o a.out %s 2>&1 | %FileCheck %s -check-prefix CHECK -check-prefix CHECK-EXEC
// CHECK: 0: input, "{{.*}}darwin-static-library-debug.swift", swift
// CHECK: 1: compile, {0}, object
// CHECK: 2: merge-module, {1}, swiftmodule
// CHECK-STATIC: 3: static-link, {1, 2}, image
// CHECK-STATIC-NOT: 4: generate-dSYM, {3}, dSYM
// CHECK-SHARED: 3: link, {1, 2}, image
// CHECK-SHARED: 4: generate-dSYM, {3}, dSYM
// CHECK-EXEC: 3: link, {1, 2}, image
// CHECK-EXEC: 4: generate-dSYM, {3}, dSYM