Merge remote-tracking branch 'origin/master' into master-next

Author: swift-ci

include/swift/AST/DiagnosticsCommon.def

@@ -95,6 +95,10 @@ NOTE(profile_read_error,none,
 ERROR(generic_signature_not_minimal,none,
       "generic requirement '%0' is redundant in %1", (StringRef, StringRef))
 
+WARNING(protocol_extension_redundant_requirement,none,
+      "requirement of '%1' to '%2' is redundant in an extension of '%0'",
+      (StringRef, StringRef, StringRef))
+
 ERROR(attr_only_on_parameters, none,
       "'%0' may only be used on parameters", (StringRef))
 

lib/Sema/TypeCheckGeneric.cpp

@@ -78,6 +78,32 @@ void checkGenericParamList(TypeChecker &tc,
     RequirementRequest::visitRequirements(owner, resolution.getStage(),
         [&](const Requirement &req, RequirementRepr *reqRepr) {
           auto source = FloatingRequirementSource::forExplicit(reqRepr);
+          
+          // If we're extending a protocol and adding a redundant requirement,
+          // for example, `extension Foo where Self: Foo`, then emit a
+          // diagnostic.
+          
+          if (auto decl = owner.dc->getAsDecl()) {
+            if (auto extDecl = dyn_cast<ExtensionDecl>(decl)) {
+              auto extType = extDecl->getExtendedType();
+              auto extSelfType = extDecl->getSelfInterfaceType();
+              auto reqLHSType = req.getFirstType();
+              auto reqRHSType = req.getSecondType();
+              
+              if (extType->isExistentialType() &&
+                  reqLHSType->isEqual(extSelfType) &&
+                  reqRHSType->isEqual(extType)) {
+                
+                auto &ctx = extDecl->getASTContext();
+                ctx.Diags.diagnose(extDecl->getLoc(),
+                                   diag::protocol_extension_redundant_requirement,
+                                   extType->getString(),
+                                   extSelfType->getString(),
+                                   reqRHSType->getString());
+              }
+            }
+          }
+          
           builder->addRequirement(req, reqRepr, source, nullptr,
                                   lookupDC->getParentModule());
           return false;

test/decl/ext/protocol.swift

@@ -176,6 +176,23 @@ extension S1 {
   }
 }
 
+// ----------------------------------------------------------------------------
+// Protocol extensions with redundant requirements
+// ----------------------------------------------------------------------------
+
+protocol FooProtocol {}
+extension FooProtocol where Self: FooProtocol {} // expected-warning {{requirement of 'Self' to 'FooProtocol' is redundant in an extension of 'FooProtocol'}}
+
+protocol AnotherFooProtocol {}
+protocol BazProtocol {}
+extension AnotherFooProtocol where Self: BazProtocol, Self: AnotherFooProtocol {} // expected-warning {{requirement of 'Self' to 'AnotherFooProtocol' is redundant in an extension of 'AnotherFooProtocol'}}
+
+protocol AnotherBazProtocol {
+  associatedtype BazValue
+}
+
+extension AnotherBazProtocol where BazValue: AnotherBazProtocol {} // ok, does not warn because BazValue is not Self
+
 // ----------------------------------------------------------------------------
 // Protocol extensions with additional requirements
 // ----------------------------------------------------------------------------