Skip to content

Commit 3e7b4ae

Browse files
committed
[Property wrappers] Fix another opaque-result-types crasher.
Test case from Holly Borla, thank you!
1 parent d43c515 commit 3e7b4ae

File tree

2 files changed

+14
-10
lines changed

2 files changed

+14
-10
lines changed

lib/Sema/TypeCheckStorage.cpp

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2683,16 +2683,17 @@ PropertyWrapperBackingPropertyInfoRequest::evaluate(Evaluator &evaluator,
26832683
pbd->setInit(0, initializer);
26842684
pbd->setInitializerChecked(0);
26852685
wrappedValue = findWrappedValuePlaceholder(initializer);
2686-
} else if (!parentPBD->isInitialized(patternNumber) &&
2687-
wrapperInfo.defaultInit) {
2688-
// FIXME: Record this expression somewhere so that DI can perform the
2689-
// initialization itself.
2690-
auto typeExpr = TypeExpr::createImplicit(storageType, ctx);
2691-
Expr *initializer = CallExpr::createImplicit(ctx, typeExpr, {}, { });
2692-
typeCheckSynthesizedWrapperInitializer(pbd, backingVar, parentPBD,
2693-
initializer);
2694-
pbd->setInit(0, initializer);
2695-
pbd->setInitializerChecked(0);
2686+
} else {
2687+
if (!parentPBD->isInitialized(patternNumber) && wrapperInfo.defaultInit) {
2688+
// FIXME: Record this expression somewhere so that DI can perform the
2689+
// initialization itself.
2690+
auto typeExpr = TypeExpr::createImplicit(storageType, ctx);
2691+
Expr *initializer = CallExpr::createImplicit(ctx, typeExpr, {}, { });
2692+
typeCheckSynthesizedWrapperInitializer(pbd, backingVar, parentPBD,
2693+
initializer);
2694+
pbd->setInit(0, initializer);
2695+
pbd->setInitializerChecked(0);
2696+
}
26962697

26972698
if (var->getOpaqueResultTypeDecl()) {
26982699
var->diagnose(diag::opaque_type_var_no_underlying_type);

test/decl/var/property_wrappers_opaque.swift

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,6 @@ struct FB7699647 {
2222
@WrapperWithDefaultInit() var otherProperty: some P // expected-error{{property declares an opaque return type, but cannot infer the underlying type from its initializer expression}}
2323
}
2424

25+
struct FB7699647b {
26+
@WrapperWithDefaultInit var property: some P // expected-error{{property declares an opaque return type, but cannot infer the underlying type from its initializer expression}}
27+
}

0 commit comments

Comments
 (0)