Skip to content

Commit 3420469

Browse files
hborlahborla
authored
Merge pull request swiftlang#38355 from hborla/5.5-wrapper-generator-substitutions
[5.5][SILGen] Correct generic signature/substitutions of property wrapper generators within a closure.
2 parents 3a5ef20 + fc48f14 commit 3420469

File tree

4 files changed

+101
-43
lines changed

4 files changed

+101
-43
lines changed

‎lib/SIL/IR/TypeLowering.cpp

Lines changed: 32 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -2383,6 +2383,7 @@ static CanType removeNoEscape(CanType resultType) {
23832383

23842384
/// Get the type of a default argument generator, () -> T.
23852385
static CanAnyFunctionType getDefaultArgGeneratorInterfaceType(
2386+
TypeConverter &TC,
23862387
SILDeclRef c) {
23872388
auto *vd = c.getDecl();
23882389
auto resultTy = getParameterAt(vd,
@@ -2400,14 +2401,7 @@ static CanAnyFunctionType getDefaultArgGeneratorInterfaceType(
24002401
canResultTy = removeNoEscape(canResultTy);
24012402

24022403
// Get the generic signature from the surrounding context.
2403-
auto sig = vd->getInnermostDeclContext()->getGenericSignatureOfContext();
2404-
if (auto *afd = dyn_cast<AbstractFunctionDecl>(vd)) {
2405-
auto *param = getParameterAt(afd, c.defaultArgIndex);
2406-
if (param->hasDefaultExpr()) {
2407-
auto captureInfo = param->getDefaultArgumentCaptureInfo();
2408-
sig = getEffectiveGenericSignature(afd, captureInfo);
2409-
}
2410-
}
2404+
auto sig = TC.getConstantGenericSignature(c);
24112405

24122406
// FIXME: Verify ExtInfo state is correct, not working by accident.
24132407
CanAnyFunctionType::ExtInfo info;
@@ -2447,38 +2441,20 @@ static CanAnyFunctionType getStoredPropertyInitializerInterfaceType(
24472441
/// (property-type) -> backing-type.
24482442
static CanAnyFunctionType getPropertyWrapperBackingInitializerInterfaceType(
24492443
TypeConverter &TC,
2450-
VarDecl *VD) {
2451-
CanType resultType =
2452-
VD->getPropertyWrapperBackingPropertyType()->getCanonicalType();
2453-
2454-
auto *DC = VD->getInnermostDeclContext();
2455-
CanType inputType =
2456-
VD->getPropertyWrapperInitValueInterfaceType()->getCanonicalType();
2457-
2458-
auto sig = DC->getGenericSignatureOfContext();
2459-
2460-
AnyFunctionType::Param param(
2461-
inputType, Identifier(),
2462-
ParameterTypeFlags().withValueOwnership(ValueOwnership::Owned));
2463-
// FIXME: Verify ExtInfo state is correct, not working by accident.
2464-
CanAnyFunctionType::ExtInfo info;
2465-
return CanAnyFunctionType::get(getCanonicalSignatureOrNull(sig), {param},
2466-
resultType, info);
2467-
}
2468-
2469-
static CanAnyFunctionType getPropertyWrapperInitFromProjectedValueInterfaceType(TypeConverter &TC,
2470-
VarDecl *VD) {
2444+
SILDeclRef c) {
2445+
auto *VD = cast<VarDecl>(c.getDecl());
24712446
CanType resultType =
24722447
VD->getPropertyWrapperBackingPropertyType()->getCanonicalType();
24732448

2474-
Type interfaceType = VD->getPropertyWrapperProjectionVar()->getInterfaceType();
2475-
if (interfaceType->hasArchetype())
2476-
interfaceType = interfaceType->mapTypeOutOfContext();
2477-
2478-
CanType inputType = interfaceType->getCanonicalType();
2449+
CanType inputType;
2450+
if (c.kind == SILDeclRef::Kind::PropertyWrapperBackingInitializer) {
2451+
inputType = VD->getPropertyWrapperInitValueInterfaceType()->getCanonicalType();
2452+
} else {
2453+
Type interfaceType = VD->getPropertyWrapperProjectionVar()->getInterfaceType();
2454+
inputType = interfaceType->getCanonicalType();
2455+
}
24792456

2480-
auto *DC = VD->getInnermostDeclContext();
2481-
auto sig = DC->getGenericSignatureOfContext();
2457+
GenericSignature sig = TC.getConstantGenericSignature(c);
24822458

24832459
AnyFunctionType::Param param(
24842460
inputType, Identifier(),
@@ -2639,15 +2615,12 @@ CanAnyFunctionType TypeConverter::makeConstantInterfaceType(SILDeclRef c) {
26392615
return getGlobalAccessorType(var->getInterfaceType()->getCanonicalType());
26402616
}
26412617
case SILDeclRef::Kind::DefaultArgGenerator:
2642-
return getDefaultArgGeneratorInterfaceType(c);
2618+
return getDefaultArgGeneratorInterfaceType(*this, c);
26432619
case SILDeclRef::Kind::StoredPropertyInitializer:
26442620
return getStoredPropertyInitializerInterfaceType(cast<VarDecl>(vd));
26452621
case SILDeclRef::Kind::PropertyWrapperBackingInitializer:
2646-
return getPropertyWrapperBackingInitializerInterfaceType(*this,
2647-
cast<VarDecl>(vd));
26482622
case SILDeclRef::Kind::PropertyWrapperInitFromProjectedValue:
2649-
return getPropertyWrapperInitFromProjectedValueInterfaceType(*this,
2650-
cast<VarDecl>(vd));
2623+
return getPropertyWrapperBackingInitializerInterfaceType(*this, c);
26512624
case SILDeclRef::Kind::IVarInitializer:
26522625
return getIVarInitDestroyerInterfaceType(cast<ClassDecl>(vd),
26532626
c.isForeign, false);
@@ -2683,11 +2656,27 @@ TypeConverter::getConstantGenericSignature(SILDeclRef c) {
26832656
return getEffectiveGenericSignature(
26842657
vd->getInnermostDeclContext(), captureInfo);
26852658
}
2659+
case SILDeclRef::Kind::PropertyWrapperBackingInitializer:
2660+
case SILDeclRef::Kind::PropertyWrapperInitFromProjectedValue: {
2661+
// FIXME: It might be better to compute lowered local captures of
2662+
// the property wrapper generator directly and collapse this into the
2663+
// above case. For now, take the generic signature of the enclosing
2664+
// context.
2665+
auto *dc = vd->getDeclContext();
2666+
if (dc->isLocalContext()) {
2667+
SILDeclRef enclosingDecl;
2668+
if (auto *closure = dyn_cast<AbstractClosureExpr>(dc)) {
2669+
enclosingDecl = SILDeclRef(closure);
2670+
} else {
2671+
enclosingDecl = SILDeclRef(cast<AbstractFunctionDecl>(dc));
2672+
}
2673+
return getConstantGenericSignature(enclosingDecl);
2674+
}
2675+
return dc->getGenericSignatureOfContext();
2676+
}
26862677
case SILDeclRef::Kind::EnumElement:
26872678
case SILDeclRef::Kind::GlobalAccessor:
26882679
case SILDeclRef::Kind::StoredPropertyInitializer:
2689-
case SILDeclRef::Kind::PropertyWrapperBackingInitializer:
2690-
case SILDeclRef::Kind::PropertyWrapperInitFromProjectedValue:
26912680
return vd->getDeclContext()->getGenericSignatureOfContext();
26922681
}
26932682

‎lib/SILGen/SILGenExpr.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5257,9 +5257,15 @@ RValue RValueEmitter::visitAppliedPropertyWrapperExpr(
52575257
break;
52585258
}
52595259

5260+
// The property wrapper generator function needs the same substitutions as the
5261+
// enclosing function or closure. If the parameter is declared in a function, take
5262+
// the substitutions from the concrete callee. Otherwise, forward the archetypes
5263+
// from the closure.
52605264
SubstitutionMap subs;
52615265
if (param->getDeclContext()->getAsDecl()) {
52625266
subs = E->getCallee().getSubstitutions();
5267+
} else {
5268+
subs = SGF.getForwardingSubstitutionMap();
52635269
}
52645270

52655271
return SGF.emitApplyOfPropertyWrapperBackingInitializer(

‎test/SILGen/default_arguments_local.swift

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,3 +70,16 @@ class ArtClass<T> {
7070

7171
inner()
7272
}
73+
74+
// CHECK-LABEL: sil hidden [ossa] @$s23default_arguments_local5outeryyxlF : $@convention(thin) <T> (@in_guaranteed T) -> ()
75+
func outer<T>(_: T) {
76+
// CHECK-LABEL: sil private [ossa] @$s23default_arguments_local5outeryyxlF5innerL_yylF : $@convention(thin) <T> () -> ()
77+
func inner() { print(T.self) }
78+
79+
// default argument 0 of hasDefault #1 <A>(x:) in outer<A>(_:)
80+
// CHECK-LABEL: sil private [ossa] @$s23default_arguments_local5outeryyxlF10hasDefaultL_1xySi_tlFfA_ : $@convention(thin) <T> () -> Int
81+
82+
// CHECK-LABEL: sil private [ossa] @$s23default_arguments_local5outeryyxlF10hasDefaultL_1xySi_tlF : $@convention(thin) <T> (Int) -> ()
83+
func hasDefault(x: Int = { inner(); return 3 }()) {}
84+
hasDefault()
85+
}

‎test/SILGen/property_wrapper_parameter.swift

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,56 @@ func testImplicitPropertyWrapper(projection: ProjectionWrapper<Int>) {
208208
// CHECK: sil private [ossa] @$s26property_wrapper_parameter27testImplicitPropertyWrapper10projectionyAA010ProjectionG0VySiG_tFSi_AFtAFcfu0_Si_AFtAFcfU0_5valueL_Sivg : $@convention(thin) (ProjectionWrapper<Int>) -> Int
209209
}
210210

211+
protocol P {}
212+
213+
// CHECK-LABEL: sil hidden [ossa] @$s26property_wrapper_parameter14genericContextyyxAA1PRzlF : $@convention(thin) <T where T : P> (@in_guaranteed T) -> ()
214+
func genericContext<T>(_: T) where T: P {
215+
let _: (ProjectionWrapper<Int>) -> Void = { $value in }
216+
217+
// implicit closure #1 in genericContext<A>(_:)
218+
// CHECK-LABEL: sil private [ossa] @$s26property_wrapper_parameter14genericContextyyxAA1PRzlFyAA17ProjectionWrapperVySiGcfu_ : $@convention(thin) (ProjectionWrapper<Int>) -> ()
219+
220+
// This property wrapper generator function should _not_ have a generic signature,
221+
// because the closure doesn't have one.
222+
223+
// property wrapper init from projected value of $value #1 in closure #1 in implicit closure #1 in genericContext<A>(_:)
224+
// CHECK-LABEL: sil private [ossa] @$s26property_wrapper_parameter14genericContextyyxAA1PRzlFyAA17ProjectionWrapperVySiGcfu_yAFcfU_6$valueL_AFvpfW : $@convention(thin) (ProjectionWrapper<Int>) -> ProjectionWrapper<Int>
225+
226+
let _: (ProjectionWrapper<Int>) -> T = { $value in
227+
fatalError()
228+
}
229+
230+
// implicit closure #2 in genericContext<A>(_:)
231+
// CHECK-LABEL: sil private [ossa] @$s26property_wrapper_parameter14genericContextyyxAA1PRzlFxAA17ProjectionWrapperVySiGcfu0_ : $@convention(thin) <T where T : P> (ProjectionWrapper<Int>) -> @out T
232+
233+
// This property wrapper generator function _should_ have a generic signature, because
234+
// the closure does have one.
235+
236+
// property wrapper init from projected value of $value #1 in closure #2 in implicit closure #2 in genericContext<A>(_:)
237+
// CHECK-LABEL: sil private [ossa] @$s26property_wrapper_parameter14genericContextyyxAA1PRzlFxAA17ProjectionWrapperVySiGcfu0_xAFcfU0_6$valueL_AFvpfW : $@convention(thin) <T where T : P> (ProjectionWrapper<Int>) -> ProjectionWrapper<Int>
238+
239+
// CHECK-LABEL: sil private [ossa] @$s26property_wrapper_parameter14genericContextyyxAA1PRzlF5innerL_1ayAA7WrapperVySiG_tAaCRzlF : $@convention(thin) (Wrapper<Int>) -> ()
240+
func inner(@Wrapper a: Int) {}
241+
242+
// property wrapper backing initializer of a #1 in inner #1 <A>(a:) in genericContext<A>(_:)
243+
// CHECK-LABEL: sil private [ossa] @$s26property_wrapper_parameter14genericContextyyxAA1PRzlF5innerL_1ayAA7WrapperVySiG_tAaCRzlFAEL_SivpfP : $@convention(thin) (Int) -> Wrapper<Int>
244+
245+
inner(a: 1)
246+
247+
// CHECK-LABEL: sil private [ossa] @$s26property_wrapper_parameter14genericContextyyxAA1PRzlF5innerL0_yyAaCRzlF : $@convention(thin) <T where T : P> () -> ()
248+
func inner() { _ = T.self }
249+
250+
// CHECK-LABEL: sil private [ossa] @$s26property_wrapper_parameter14genericContextyyxAA1PRzlF5innerL1_1byAA7WrapperVySiG_tAaCRzlF : $@convention(thin) <T where T : P> (Wrapper<Int>) -> ()
251+
func inner(@Wrapper b: Int) {
252+
inner()
253+
}
254+
255+
// property wrapper backing initializer of b #1 in inner #3 <A>(b:) in genericContext<A>(_:)
256+
// CHECK-LABEL: sil private [ossa] @$s26property_wrapper_parameter14genericContextyyxAA1PRzlF5innerL1_1byAA7WrapperVySiG_tAaCRzlFAEL_SivpfP : $@convention(thin) <T where T : P> (Int) -> Wrapper<Int>
257+
258+
inner(b: 1)
259+
}
260+
211261
@propertyWrapper
212262
public struct PublicWrapper<T> {
213263
public var wrappedValue: T

0 commit comments

Comments
 (0)