Skip to content
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

TypeCheckType: Do not fail after emitting a warning #79934

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+13 −26
Open

TypeCheckType: Do not fail after emitting a warning #79934

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
17 changes: 1 addition & 16 deletions lib/Sema/TypeCheckType.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -915,22 +915,7 @@ static Type applyGenericArguments(Type type,
argTys.push_back(argTy);
}

auto parameterized =
ParameterizedProtocolType::get(ctx, protoType, argTys);

// FIXME: Can this not be done in ExistentialTypeSyntaxChecker?
if (resolution.getOptions().isConstraintImplicitExistential() &&
!ctx.LangOpts.hasFeature(Feature::ImplicitSome)) {
diags
.diagnose(loc, diag::existential_requires_any, parameterized,
ExistentialType::get(parameterized),
/*isAlias=*/isa<TypeAliasType>(type.getPointer()))
.warnUntilSwiftVersion(7);

return ErrorType::get(ctx);
}

return parameterized;
return ParameterizedProtocolType::get(ctx, protoType, argTys);
}

// Builtins have special handling.
Expand Down
16 changes: 9 additions & 7 deletions test/type/explicit_existential.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,13 +173,13 @@ protocol Collection<T> {
struct TestParameterizedProtocol<T> : Collection {
typealias T = T

let x : Collection<T> // expected-warning {{use of protocol 'Collection<T>' as a type must be written 'any Collection<T>'}}
let x : Collection<T> // expected-warning {{use of protocol 'Collection' as a type must be written 'any Collection'}}
}

func acceptAny(_: Collection<Int>) {}
// expected-warning@-1 {{use of protocol 'Collection<Int>' as a type must be written 'any Collection<Int>'}}
// expected-warning@-1 {{use of protocol 'Collection' as a type must be written 'any Collection'}}
func returnsAny() -> Collection<Int> {}
// expected-warning@-1 {{use of protocol 'Collection<Int>' as a type must be written 'any Collection<Int>'}}
// expected-warning@-1 {{use of protocol 'Collection' as a type must be written 'any Collection'}}

func testInvalidAny() {
struct S: HasAssoc {
Expand Down Expand Up @@ -374,8 +374,8 @@ func testAnyFixIt() {
let _: Optional<HasAssoc>
// expected-warning@+1 {{constraint that suppresses conformance requires 'any'}}{{19-28=any ~Copyable}}
let _: Optional<~Copyable>
// FIXME: No fix-it + generic argument not diagnosed.
// expected-warning@+1 {{use of protocol 'HasAssocGeneric<any HasAssoc>' as a type must be written 'any HasAssocGeneric<any HasAssoc>'}}{{none}}
// expected-warning@+2:10 {{use of protocol 'HasAssocGeneric' as a type must be written 'any HasAssocGeneric'}}{{10-35=any HasAssocGeneric<HasAssoc>}}
// expected-warning@+1:26 {{use of protocol 'HasAssoc' as a type must be written 'any HasAssoc'}}{{26-34=any HasAssoc}}
let _: HasAssocGeneric<HasAssoc>
// expected-warning@+1 {{use of protocol 'HasAssoc' as a type must be written 'any HasAssoc'}}{{14-22=any HasAssoc}}
let _: S.G<HasAssoc>
Expand Down Expand Up @@ -407,8 +407,8 @@ func testAnyFixIt() {
// expected-warning@+2 {{use of protocol 'HasAssoc' as a type must be written 'any HasAssoc'}}{{13-21=any HasAssoc}}
// expected-warning@+1 {{constraint that suppresses conformance requires 'any'}}{{10-37=any ~G<HasAssoc>.Copyable_Alias}}
let _: ~G<HasAssoc>.Copyable_Alias
// FIXME: No fix-it + generic argument not diagnosed.
// expected-warning@+1 {{use of 'HasAssocGeneric<any HasAssoc>' as a type must be written 'any HasAssocGeneric<any HasAssoc>}}{{none}}
// expected-warning@+2:12 {{use of 'S.HasAssocGeneric_Alias' (aka 'HasAssocGeneric') as a type must be written 'any S.HasAssocGeneric_Alias' (aka 'any HasAssocGeneric')}} {{10-43=any S.HasAssocGeneric_Alias<HasAssoc>}}
// expected-warning@+1:34 {{use of protocol 'HasAssoc' as a type must be written 'any HasAssoc'}}{{34-42=any HasAssoc}}
let _: S.HasAssocGeneric_Alias<HasAssoc>
// FIXME: No diagnostic.
let _: HasAssoc.Int_Alias
Expand Down Expand Up @@ -543,6 +543,8 @@ func testAnyFixIt() {

// expected-error@+1 {{optional 'any' type must be written '(any HasAssoc)?'}}{{10-23=(any HasAssoc)?}}
let _: any HasAssoc?
// expected-error@+1:10 {{optional 'any' type must be written '(any HasAssocGeneric<Int>)?'}}{{10-35=(any HasAssocGeneric<Int>)?}}
let _: any HasAssocGeneric<Int>?
// FIXME: Better recovery
// expected-error@+1 {{type '(any Copyable)?' cannot be suppressed}}
let _: any ~Copyable?
Expand Down
6 changes: 3 additions & 3 deletions test/type/parameterized_existential.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ protocol Sequence<Element> { // expected-note {{'Sequence' declared here}}
// 'any' is required here

func takesSequenceOfInt1(_: Sequence<Int>) {}
// expected-warning@-1 {{use of protocol 'Sequence<Int>' as a type must be written 'any Sequence<Int>'}}
// expected-warning@-1 {{use of protocol 'Sequence' as a type must be written 'any Sequence'}}

func returnsSequenceOfInt1() -> Sequence<Int> {}
// expected-warning@-1 {{use of protocol 'Sequence<Int>' as a type must be written 'any Sequence<Int>'}}
// expected-warning@-1 {{use of protocol 'Sequence' as a type must be written 'any Sequence'}}

struct ConcreteSequence<Element> : Sequence {}

Expand Down Expand Up @@ -74,7 +74,7 @@ func saturation(_ dry: any Sponge, _ wet: any Sponge<Int, Int>) {

func typeExpr() {
_ = Sequence<Int>.self
// expected-warning@-1 {{use of protocol 'Sequence<Int>' as a type must be written 'any Sequence<Int>'}}
// expected-warning@-1 {{use of protocol 'Sequence' as a type must be written 'any Sequence'}}

_ = any Sequence<Int>.self
// expected-error@-1 {{'self' is not a member type of protocol 'parameterized_existential.Sequence<Swift.Int>'}}
Expand Down