Skip to content

[6.3] CustomAvailability: synthesized dynamic availability checking function should be private #85565

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.

Sign up for GitHub

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 1 commit into from
Nov 19, 2025
Merged

[6.3] CustomAvailability: synthesized dynamic availability checking function should be private #85565

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion lib/ClangImporter/SwiftDeclSynthesizer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3183,7 +3183,7 @@ FuncDecl *SwiftDeclSynthesizer::makeAvailabilityDomainPredicate(
BuiltinIntegerType::get(1, ctx), ImporterImpl.ImportedHeaderUnit);
funcDecl->setBodySynthesizer(synthesizeAvailabilityDomainPredicateBody,
(void *)var);
funcDecl->setAccess(AccessLevel::Internal);
funcDecl->setAccess(AccessLevel::Private);

ImporterImpl.availabilityDomainPredicates[var] = funcDecl;

Expand Down
5 changes: 5 additions & 0 deletions test/Availability/Inputs/AvailabilityDomains.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#include "AvailabilityDomains.h"

int dynamic_domain_pred() {
return 1;
}
15 changes: 15 additions & 0 deletions test/Availability/Inputs/custom_availability_file1.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
@available(DynamicDomain)
public struct X {
public init() { }
}

public struct Z {
public init() {
if #available(DynamicDomain) {
print("#available")
print(X())
} else {
print("#unavailable")
}
}
}
12 changes: 12 additions & 0 deletions test/Availability/Inputs/custom_availability_file2.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
public struct Y {
init() {
if #available(DynamicDomain) {
print("#available")
print(X())
print(Z())
} else {
print("#unavailable")
print(Z())
}
}
}
6 changes: 6 additions & 0 deletions test/Availability/availability_custom_domains_clang_build.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
// REQUIRES: swift_feature_CustomAvailability

// RUN: %empty-directory(%t)
// RUN: %target-clang -x c %S/Inputs/AvailabilityDomains.c -o %t/AvailabilityDomains.c.o -c
// RUN: %target-build-swift -emit-library %S/Inputs/custom_availability_file1.swift %S/Inputs/custom_availability_file2.swift -module-name main -enable-experimental-feature CustomAvailability -import-bridging-header %S/Inputs/AvailabilityDomains.h -Xlinker %t/AvailabilityDomains.c.o
// RUN: %target-build-swift -wmo -emit-library %S/Inputs/custom_availability_file1.swift %S/Inputs/custom_availability_file2.swift -module-name main -enable-experimental-feature CustomAvailability -import-bridging-header %S/Inputs/AvailabilityDomains.h -Xlinker %t/AvailabilityDomains.c.o
2 changes: 1 addition & 1 deletion test/SILGen/availability_query_custom_domains_clang.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ public func testIfAvailableDynamicDomain() {
}
// CHECK: end sil function '$s4Test28testIfAvailableDynamicDomainyyF'

// CHECK-LABEL: sil hidden [ossa] @$sSC33__swift_DynamicDomain_isAvailableBi1_yF : $@convention(thin) () -> Builtin.Int1
// CHECK-LABEL: sil private [ossa] @$sSC33__swift_DynamicDomain_isAvailableBi1_yF : $@convention(thin) () -> Builtin.Int1
// CHECK: bb0:
// CHECK: [[QUERY_FUNC:%.*]] = function_ref @$sSo27__DynamicDomain_isAvailableSbyFTo : $@convention(c) () -> Bool
// CHECK: [[QUERY_RESULT:%.*]] = apply [[QUERY_FUNC]]() : $@convention(c) () -> Bool
Expand Down