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

Sema: Inherit SPI groups when synthesizing modify accessor.

Browse Source 
Resolves rdar://108069565
This commit is contained in:
Allan Shortlidge
2023-05-01 00:05:59 -07:00
parent 9c68aaac2d
commit aef5e42457
5 changed files with 60 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/Sema/CodeSynthesis.cpp
View File

@@ -1494,3 +1494,15 @@ bool swift::addNonIsolatedToSynthesized(NominalTypeDecl *nominal,
value->getAttrs().add(new (ctx) NonisolatedAttr(/*isImplicit=*/true));
return true;
}
void swift::applyInferredSPIAccessControlAttr(Decl *decl,
const Decl *inferredFromDecl,
ASTContext &ctx) {
auto spiGroups = inferredFromDecl->getSPIGroups();
if (spiGroups.empty())
return;
auto spiAttr =
SPIAccessControlAttr::create(ctx, SourceLoc(), SourceRange(), spiGroups);
decl->getAttrs().add(spiAttr);
}

4
lib/Sema/CodeSynthesis.h
View File

@@ -89,6 +89,10 @@ bool hasLetStoredPropertyWithInitialValue(NominalTypeDecl *nominal);
/// if an attribute was added.
bool addNonIsolatedToSynthesized(NominalTypeDecl *nominal, ValueDecl *value);
/// Adds the `@_spi` groups from \p inferredFromDecl to \p decl.
void applyInferredSPIAccessControlAttr(Decl *decl, const Decl *inferredFromDecl,
ASTContext &ctx);
} // end namespace swift
#endif

6
lib/Sema/TypeCheckStorage.cpp
View File

@@ -2324,6 +2324,12 @@ createCoroutineAccessorPrototype(AbstractStorageDecl *storage,
AvailabilityInference::applyInferredAvailableAttrs(accessor,
asAvailableAs, ctx);
// A modify coroutine should have the same SPI visibility as the setter.
if (kind == AccessorKind::Modify) {
if (FuncDecl *setter = storage->getParsedAccessor(AccessorKind::Set))
applyInferredSPIAccessControlAttr(accessor, setter, ctx);
}
finishImplicitAccessor(accessor, ctx);
return accessor;

16
test/SPI/private_swiftinterface.swift
View File

@@ -139,6 +139,22 @@ public class SomeClass {
}
public struct PublicStruct {
@_spi(S) public var spiVar: SomeClass
// CHECK-PRIVATE: @_spi(S) public var spiVar: {{.*}}.SomeClass
// CHECK-PUBLIC-NOT: spiVar
public var publicVarWithSPISet: SomeClass {
get { SomeClass() }
@_spi(S) set {}
}
// CHECK-PRIVATE: public var publicVarWithSPISet: {{.*}}.SomeClass {
// CHECK-PRIVATE-NEXT: get
// CHECK-PRIVATE-NEXT: @_spi(S) set
// CHECK-PRIVATE-NEXT: }
// CHECK-PUBLIC: public var publicVarWithSPISet: {{.*}}.SomeClass {
// CHECK-PUBLIC-NEXT: get
// CHECK-PUBLIC-NEXT: }
@_spi(S) @Wrapper public var spiWrappedSimple: SomeClass
// CHECK-PRIVATE: @_spi(S) @{{.*}}.Wrapper public var spiWrappedSimple: {{.*}}.SomeClass
// CHECK-PUBLIC-NOT: spiWrappedSimple

26
test/api-digester/ignore-spi-by-given-group-name.swift
View File

@@ -2,21 +2,39 @@
// RUN: %target-swift-frontend -emit-module -o %t/Foo.swiftmodule -emit-abi-descriptor-path %t/abi-before.json %s -enable-library-evolution -DBASELINE -emit-tbd-path %t/abi-before.tbd
// RUN: %target-swift-frontend -emit-module -o %t/Foo.swiftmodule -emit-abi-descriptor-path %t/abi-after.json %s -enable-library-evolution -emit-tbd-path %t/abi-after.tbd
// RUN: %api-digester -diagnose-sdk --input-paths %t/abi-before.json -input-paths %t/abi-after.json -abi -o %t/result.txt
// RUN: %FileCheck %s -check-prefix CHECK_INCLUDE_SPI < %t/result.txt
// RUN: %api-digester -diagnose-sdk --input-paths %t/abi-before.json -input-paths %t/abi-after.json -abi -o %t/include-result.txt
// RUN: %FileCheck %s -check-prefix CHECK_INCLUDE_SPI < %t/include-result.txt
// RUN: %api-digester -diagnose-sdk --input-paths %t/abi-before.json -input-paths %t/abi-after.json -abi -o %t/result.txt -ignore-spi-group secret
// RUN: %FileCheck -check-prefix CHECK_EXCLUDE_SPI %s < %t/result.txt
// RUN: %api-digester -diagnose-sdk --input-paths %t/abi-before.json -input-paths %t/abi-after.json -abi -o %t/exclude-result.txt -ignore-spi-group secret
// RUN: %FileCheck -check-prefix CHECK_EXCLUDE_SPI %s < %t/exclude-result.txt
#if BASELINE
public struct Struct {
public var x: Int {
get { 0 }
@_spi(secret) set {}
}
}
@_spi(secret)
public func foo() {}
#else
public struct Struct {
public var x: Int {
get { 0 }
}
}
#endif
// CHECK_INCLUDE_SPI: Accessor Struct.x.Modify() has been removed
// CHECK_EXCLUDE_SPI-NOT: Struct.x.Modify()
// CHECK_INCLUDE_SPI: Accessor Struct.x.Set() has been removed
// CHECK_EXCLUDE_SPI-NOT: Struct.x.Set()
// CHECK_INCLUDE_SPI: Func foo() has been removed
// CHECK_EXCLUDE_SPI-NOT: foo()