Skip to content

Emit default arg for a package func during silgen #69414

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions lib/SIL/IR/SILSymbolVisitor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -420,9 +420,14 @@ class SILSymbolVisitorImpl : public ASTVisitor<SILSymbolVisitorImpl> {

void visitDefaultArguments(ValueDecl *VD, ParameterList *PL) {
auto moduleDecl = VD->getModuleContext();
auto publicDefaultArgGenerators = moduleDecl->isTestingEnabled() ||
moduleDecl->arePrivateImportsEnabled();
if (Ctx.getOpts().PublicSymbolsOnly && !publicDefaultArgGenerators)
// Check if symbols should be more visible than their declared access level.
// In case of `package` access level, the symbol should be visible by an
// external module in the same package, thus the default argument should be
// generated and its linkage emitted.
auto shouldGenerateDefaultArgs = moduleDecl->isTestingEnabled() ||
moduleDecl->arePrivateImportsEnabled() ||
VD->getFormalAccess() == AccessLevel::Package;
if (Ctx.getOpts().PublicSymbolsOnly && !shouldGenerateDefaultArgs)
return;

// In Swift 3 (or under -enable-testing), default arguments (of public
Expand Down
59 changes: 59 additions & 0 deletions test/TBD/package_symbol_with_default_arg.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
// RUN: %empty-directory(%t)
// RUN: split-file %s %t

// RUN: %target-build-swift-dylib(%t/%target-library-name(Utils)) %t/Utils.swift \
// RUN: -module-name Utils -package-name mypkg \
// RUN: -emit-module -emit-module-path %t/Utils.swiftmodule \
// RUN: -emit-tbd -emit-tbd-path %t/libUtils.tbd -Xfrontend -tbd-install_name=%t/libUtils.dylib -Xfrontend -validate-tbd-against-ir=all

// RUN: %FileCheck %s --check-prefix CHECK-TBD < %t/libUtils.tbd
// CHECK-TBD-NOT: $s5Utils6pubBar3argS2i_tFfA_
// CHECK-TBD-NOT: $s5Utils11internalBar3argS2i_tF
// CHECK-TBD-NOT: $s5Utils11internalBar3argS2i_tFfA_
// CHECK-TBD-NOT: $s5Utils11internalFoo3argS2i_tF
// CHECK-TBD: $s5Utils6pkgBar3argS2i_tF
// CHECK-TBD: $s5Utils6pkgBar3argS2i_tFfA_
// CHECK-TBD: $s5Utils6pkgFoo3argS2i_tF
// CHECK-TBD: $s5Utils6pubBar3argS2i_tF
// CHECK-TBD: $s5Utils6pubFoo3argS2i_tF

// RUN: %target-build-swift-dylib(%t/%target-library-name(UtilsForTesting)) %t/Utils.swift \
// RUN: -module-name UtilsForTesting -package-name testpkg \
// RUN: -emit-module -emit-module-path %t/UtilsForTesting.swiftmodule \
// RUN: -emit-tbd -emit-tbd-path %t/libUtilsForTesting.tbd -Xfrontend -tbd-install_name=%t/libUtilsForTesting.dylib \
// RUN: -enable-testing -Xfrontend -validate-tbd-against-ir=all


// RUN: %FileCheck %s --check-prefix CHECK-TEST < %t/libUtilsForTesting.tbd
// CHECK-TEST-NOT: $s15UtilsForTesting6pubBar3argS2i_tFfA_
// CHECK-TEST: $s15UtilsForTesting11internalBar3argS2i_tF
// CHECK-TEST: $s15UtilsForTesting11internalBar3argS2i_tFfA_
// CHECK-TEST: $s15UtilsForTesting11internalFoo3argS2i_tF
// CHECK-TEST: $s15UtilsForTesting6pkgBar3argS2i_tF
// CHECK-TEST: $s15UtilsForTesting6pkgBar3argS2i_tFfA_
// CHECK-TEST: $s15UtilsForTesting6pkgFoo3argS2i_tF
// CHECK-TEST: $s15UtilsForTesting6pubBar3argS2i_tF
// CHECK-TEST: $s15UtilsForTesting6pubFoo3argS2i_tF

// RUN: %target-swift-frontend -typecheck %t/main.swift -I %t -L %t -lUtils -package-name mypkg -verify


//--- Utils.swift
public func pubBar(arg: Int = 1) -> Int { return arg + 11 }
package func pkgBar(arg: Int = 1) -> Int { return arg + 12 }
func internalBar(arg: Int = 1) -> Int { return arg + 13 }

public func pubFoo(arg: Int) -> Int { return arg + 1 }
package func pkgFoo(arg: Int) -> Int { return arg + 2 }
func internalFoo(arg: Int) -> Int { return arg + 3 }

//--- main.swift
import Utils

let a = pubBar()
let b = pkgBar()

let c = pubFoo(arg: 3)
let d = pkgFoo(arg: 5)

print(a, b, c, d)