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

Don't allow overloading by opaque types with different constraints.

Browse Source 
The mangling unfortunately doesn't take the constraints into account, leading to
SR-10725 | rdar://problem/50987172. Changing the mangling at this point is hazardous, so it's probably best
to disallow this for now.
This commit is contained in:
Joe Groff
2019-07-11 15:12:43 -07:00
parent ba7393682d
commit a92fd9defb
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/AST/Decl.cpp
View File

@@ -2369,7 +2369,7 @@ static Type mapSignatureFunctionType(ASTContext &ctx, Type type,
// Functions and subscripts cannot overload differing only in opaque return // Functions and subscripts cannot overload differing only in opaque return
// types. Replace the opaque type with `Any`. // types. Replace the opaque type with `Any`.
if (auto opaque = type->getAs<OpaqueTypeArchetypeType>()) { if (auto opaque = type->getAs<OpaqueTypeArchetypeType>()) {
type = opaque->getExistentialType(); type = ProtocolCompositionType::get(ctx, {}, /*hasAnyObject*/ false);
} }
return mapSignatureParamType(ctx, type); return mapSignatureParamType(ctx, type);

13
test/type/opaque.swift
View File

@@ -272,10 +272,11 @@ func associatedTypeIdentity() {
sameType(gary(doug()).r_out(), gary(candace()).r_out()) // expected-error{{}} sameType(gary(doug()).r_out(), gary(candace()).r_out()) // expected-error{{}}
} }
func redeclaration() -> some P { return 0 } // expected-note{{previously declared}} func redeclaration() -> some P { return 0 } // expected-note 2{{previously declared}}
func redeclaration() -> some P { return 0 } // expected-error{{redeclaration}} func redeclaration() -> some P { return 0 } // expected-error{{redeclaration}}
func redeclaration() -> some Q { return 0 } func redeclaration() -> some Q { return 0 } // expected-error{{redeclaration}}
func redeclaration() -> P { return 0 } func redeclaration() -> P { return 0 }
func redeclaration() -> Any { return 0 }
var redeclaredProp: some P { return 0 } // expected-note 3{{previously declared}} var redeclaredProp: some P { return 0 } // expected-note 3{{previously declared}}
var redeclaredProp: some P { return 0 } // expected-error{{redeclaration}} var redeclaredProp: some P { return 0 } // expected-error{{redeclaration}}
@@ -283,9 +284,9 @@ var redeclaredProp: some Q { return 0 } // expected-error{{redeclaration}}
var redeclaredProp: P { return 0 } // expected-error{{redeclaration}} var redeclaredProp: P { return 0 } // expected-error{{redeclaration}}
struct RedeclarationTest { struct RedeclarationTest {
func redeclaration() -> some P { return 0 } // expected-note{{previously declared}} func redeclaration() -> some P { return 0 } // expected-note 2{{previously declared}}
func redeclaration() -> some P { return 0 } // expected-error{{redeclaration}} func redeclaration() -> some P { return 0 } // expected-error{{redeclaration}}
func redeclaration() -> some Q { return 0 } func redeclaration() -> some Q { return 0 } // expected-error{{redeclaration}}
func redeclaration() -> P { return 0 } func redeclaration() -> P { return 0 }
var redeclaredProp: some P { return 0 } // expected-note 3{{previously declared}} var redeclaredProp: some P { return 0 } // expected-note 3{{previously declared}}
@@ -293,9 +294,9 @@ struct RedeclarationTest {
var redeclaredProp: some Q { return 0 } // expected-error{{redeclaration}} var redeclaredProp: some Q { return 0 } // expected-error{{redeclaration}}
var redeclaredProp: P { return 0 } // expected-error{{redeclaration}} var redeclaredProp: P { return 0 } // expected-error{{redeclaration}}
subscript(redeclared _: Int) -> some P { return 0 } // expected-note{{previously declared}} subscript(redeclared _: Int) -> some P { return 0 } // expected-note 2{{previously declared}}
subscript(redeclared _: Int) -> some P { return 0 } // expected-error{{redeclaration}} subscript(redeclared _: Int) -> some P { return 0 } // expected-error{{redeclaration}}
subscript(redeclared _: Int) -> some Q { return 0 } subscript(redeclared _: Int) -> some Q { return 0 } // expected-error{{redeclaration}}
subscript(redeclared _: Int) -> P { return 0 } subscript(redeclared _: Int) -> P { return 0 }
} }