Merge pull request #40953 from AnthonyLatsis/any-aint-some

Parse: Fix accidental parsing of ExistentialTypeRepr as OpaqueReturnTypeRepr and vice versa

Author: AnthonyLatsis

lib/Parse/ParseType.cpp

@@ -796,6 +796,7 @@ Parser::parseTypeIdentifier(bool isParsingQualifiedDeclBaseType) {
 ///
 ///   type-composition:
 ///     'some'? type-simple
+///     'any'? type-simple
 ///     type-composition '&' type-simple
 ParserResult<TypeRepr>
 Parser::parseTypeSimpleOrComposition(Diag<> MessageID, ParseTypeReason reason) {
@@ -818,8 +819,9 @@ Parser::parseTypeSimpleOrComposition(Diag<> MessageID, ParseTypeReason reason) {
     SomeTypeContext.setTransparent();
   }
 
-  auto applyOpaque = [&](TypeRepr *type) -> TypeRepr* {
-    if (opaqueLoc.isValid()) {
+  auto applyOpaque = [&](TypeRepr *type) -> TypeRepr * {
+    if (opaqueLoc.isValid() &&
+        (anyLoc.isInvalid() || SourceMgr.isBeforeInBuffer(opaqueLoc, anyLoc))) {
       type = new (Context) OpaqueReturnTypeRepr(opaqueLoc, type);
     } else if (anyLoc.isValid()) {
       type = new (Context) ExistentialTypeRepr(anyLoc, type);
@@ -879,14 +881,18 @@ Parser::parseTypeSimpleOrComposition(Diag<> MessageID, ParseTypeReason reason) {
       auto keyword = Tok.getText();
       auto badLoc = consumeToken();
 
+      const bool isAnyKeyword = keyword.equals("any");
+
       diagnose(badLoc, diag::opaque_mid_composition, keyword)
           .fixItRemove(badLoc)
           .fixItInsert(FirstTypeLoc, keyword.str() + " ");
 
-      if (opaqueLoc.isInvalid()) {
+      if (isAnyKeyword) {
+        if (anyLoc.isInvalid()) {
+          anyLoc = badLoc;
+        }
+      } else if (opaqueLoc.isInvalid()) {
         opaqueLoc = badLoc;
-      } else if (anyLoc.isInvalid()) {
-        anyLoc = badLoc;
       }
     }
 

test/type/explicit_existential.swift

@@ -156,6 +156,17 @@ func anyAny() {
 
 protocol P1 {}
 protocol P2 {}
+do {
+  // Test that we don't accidentally misparse an 'any' type as a 'some' type
+  // and vice versa.
+  let _: P1 & any P2 // expected-error {{'any' should appear at the beginning of a composition}}
+  let _: any P1 & any P2 // expected-error {{'any' should appear at the beginning of a composition}}
+  let _: any P1 & some P2 // expected-error {{'some' should appear at the beginning of a composition}}
+  let _: some P1 & any P2
+  // expected-error@-1 {{'some' type can only be declared on a single property declaration}}
+  // expected-error@-2 {{'any' should appear at the beginning of a composition}}
+}
+
 struct ConcreteComposition: P1, P2 {}
 
 func testMetatypes() {