Skip to content

Commit 607a61d

Browse files
committed
Sema: Synthesized setters get the availability of the decl they're synthesized from.
If a modify/mutableAddress coroutine is defined with availability, or a property wrapper adds a setter with availability, then the implicit synthesized setter should be as available as those declarations it's synthesized from. rdar://problem/65152582
1 parent c228504 commit 607a61d

File tree

2 files changed

+138
-1
lines changed

2 files changed

+138
-1
lines changed

lib/Sema/TypeCheckStorage.cpp

Lines changed: 69 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1669,7 +1669,7 @@ synthesizeSetterBody(AccessorDecl *setter, ASTContext &ctx) {
16691669
case WriteImplKind::Modify:
16701670
return synthesizeModifyCoroutineSetterBody(setter, ctx);
16711671
}
1672-
llvm_unreachable("bad ReadImplKind");
1672+
llvm_unreachable("bad WriteImplKind");
16731673
}
16741674

16751675
static std::pair<BraceStmt *, bool>
@@ -1950,7 +1950,75 @@ static AccessorDecl *createSetterPrototype(AbstractStorageDecl *storage,
19501950

19511951
// All mutable storage requires a setter.
19521952
assert(storage->requiresOpaqueAccessor(AccessorKind::Set));
1953+
1954+
// Copy availability from the accessor we'll synthesize the setter from.
1955+
SmallVector<Decl *, 2> asAvailableAs;
1956+
1957+
// That could be a property wrapper...
1958+
if (auto var = dyn_cast<VarDecl>(storage)) {
1959+
if (var->hasAttachedPropertyWrapper()) {
1960+
// The property wrapper info may not actually link back to a wrapper
1961+
// implementation, if there was a semantic error checking the wrapper.
1962+
auto info = var->getAttachedPropertyWrapperTypeInfo(0);
1963+
if (info.valueVar) {
1964+
if (auto setter = info.valueVar->getOpaqueAccessor(AccessorKind::Set)) {
1965+
asAvailableAs.push_back(setter);
1966+
}
1967+
}
1968+
} else if (auto wrapperSynthesizedKind
1969+
= var->getPropertyWrapperSynthesizedPropertyKind()) {
1970+
switch (*wrapperSynthesizedKind) {
1971+
case PropertyWrapperSynthesizedPropertyKind::Backing:
1972+
break;
1973+
1974+
case PropertyWrapperSynthesizedPropertyKind::StorageWrapper: {
1975+
if (auto origVar = var->getOriginalWrappedProperty(wrapperSynthesizedKind)) {
1976+
// The property wrapper info may not actually link back to a wrapper
1977+
// implementation, if there was a semantic error checking the wrapper.
1978+
auto info = origVar->getAttachedPropertyWrapperTypeInfo(0);
1979+
if (info.projectedValueVar) {
1980+
if (auto setter
1981+
= info.projectedValueVar->getOpaqueAccessor(AccessorKind::Set)){
1982+
asAvailableAs.push_back(setter);
1983+
}
1984+
}
1985+
}
1986+
break;
1987+
}
1988+
}
1989+
}
1990+
}
19531991

1992+
1993+
// ...or another accessor.
1994+
switch (storage->getWriteImpl()) {
1995+
case WriteImplKind::Immutable:
1996+
llvm_unreachable("synthesizing setter from immutable storage");
1997+
case WriteImplKind::Stored:
1998+
case WriteImplKind::StoredWithObservers:
1999+
case WriteImplKind::InheritedWithObservers:
2000+
case WriteImplKind::Set:
2001+
// Setter's availability shouldn't be externally influenced in these
2002+
// cases.
2003+
break;
2004+
2005+
case WriteImplKind::MutableAddress:
2006+
if (auto addr = storage->getOpaqueAccessor(AccessorKind::MutableAddress)) {
2007+
asAvailableAs.push_back(addr);
2008+
}
2009+
break;
2010+
case WriteImplKind::Modify:
2011+
if (auto mod = storage->getOpaqueAccessor(AccessorKind::Modify)) {
2012+
asAvailableAs.push_back(mod);
2013+
}
2014+
break;
2015+
}
2016+
2017+
if (!asAvailableAs.empty()) {
2018+
AvailabilityInference::applyInferredAvailableAttrs(
2019+
setter, asAvailableAs, ctx);
2020+
}
2021+
19542022
finishImplicitAccessor(setter, ctx);
19552023

19562024
return setter;
Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
// RUN: %empty-directory(%t)
2+
// RUN: %target-swift-frontend -target x86_64-apple-macosx10.9 -typecheck -verify %s
3+
4+
// REQUIRES: OS=macosx
5+
6+
@propertyWrapper
7+
struct SetterConditionallyAvailable<T> {
8+
var wrappedValue: T {
9+
get { fatalError() }
10+
11+
@available(macOS 10.10, *)
12+
set { fatalError() }
13+
}
14+
15+
var projectedValue: T {
16+
get { fatalError() }
17+
18+
@available(macOS 10.10, *)
19+
set { fatalError() }
20+
}
21+
}
22+
23+
@propertyWrapper
24+
struct ModifyConditionallyAvailable<T> {
25+
var wrappedValue: T {
26+
get { fatalError() }
27+
28+
@available(macOS 10.10, *)
29+
_modify { fatalError() }
30+
}
31+
32+
var projectedValue: T {
33+
get { fatalError() }
34+
35+
@available(macOS 10.10, *)
36+
_modify { fatalError() }
37+
}
38+
}
39+
40+
struct Butt {
41+
var modify_conditionally_available: Int {
42+
get { fatalError() }
43+
44+
@available(macOS 10.10, *)
45+
_modify { fatalError() }
46+
}
47+
48+
@SetterConditionallyAvailable
49+
var wrapped_setter_conditionally_available: Int
50+
51+
@ModifyConditionallyAvailable
52+
var wrapped_modify_conditionally_available: Int
53+
}
54+
55+
func butt(x: inout Butt) { // expected-note*{{}}
56+
x.modify_conditionally_available = 0 // expected-error{{only available in macOS 10.10 or newer}} expected-note{{}}
57+
x.wrapped_setter_conditionally_available = 0 // expected-error{{only available in macOS 10.10 or newer}} expected-note{{}}
58+
x.wrapped_modify_conditionally_available = 0 // expected-error{{only available in macOS 10.10 or newer}} expected-note{{}}
59+
x.$wrapped_setter_conditionally_available = 0 // expected-error{{only available in macOS 10.10 or newer}} expected-note{{}}
60+
x.$wrapped_modify_conditionally_available = 0 // expected-error{{only available in macOS 10.10 or newer}} expected-note{{}}
61+
62+
if #available(macOS 10.10, *) {
63+
x.modify_conditionally_available = 0
64+
x.wrapped_setter_conditionally_available = 0
65+
x.wrapped_modify_conditionally_available = 0
66+
x.$wrapped_setter_conditionally_available = 0
67+
x.$wrapped_modify_conditionally_available = 0
68+
}
69+
}

0 commit comments

Comments
 (0)