Merge pull request #42043 from slavapestov/rqm-diagnostics-request-cycle

RequirementMachine: Fix request evaluator cycle if a typealias requirement becomes redundant
apple · Mar 27, 2022 · 7fccd25 · 7fccd25
2 parents 0045840 + b859ac1
commit 7fccd25
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/lib/AST/DiagnosticEngine.cpp b/lib/AST/DiagnosticEngine.cpp
@@ -480,7 +480,7 @@ static bool isInterestingTypealias(Type type) {
   else
     return false;
 
-  if (aliasDecl->getUnderlyingType()->isVoid())
+  if (type->isVoid())
     return false;
 
   // The 'Swift.AnyObject' typealias is not 'interesting'.

diff --git a/lib/AST/RequirementMachine/RequirementLowering.cpp b/lib/AST/RequirementMachine/RequirementLowering.cpp
@@ -712,7 +712,13 @@ StructuralRequirementsRequest::evaluate(Evaluator &evaluator,
         if (assocTypes.contains(typeAliasDecl->getName()))
           continue;
 
+        // The structural type of a typealias will always be a TypeAliasType,
+        // so unwrap it to avoid a requirement that prints as 'Self.T == Self.T'
+        // in diagnostics.
         auto underlyingType = typeAliasDecl->getStructuralType();
+        if (auto *aliasType = dyn_cast<TypeAliasType>(underlyingType.getPointer()))
+          underlyingType = aliasType->getSinglyDesugaredType();
+
         if (underlyingType->is<UnboundGenericType>())
           continue;
 

diff --git a/test/Generics/protocol_typealias_cycle_5.swift b/test/Generics/protocol_typealias_cycle_5.swift
@@ -0,0 +1,7 @@
+// RUN: %target-typecheck-verify-swift -requirement-machine-protocol-signatures=on
+
+protocol P : Sequence {
+  typealias Element = Iterator.Element
+  // expected-warning@-1 {{typealias overriding associated type 'Element' from protocol 'Sequence' is better expressed as same-type constraint on the protocol}}
+  // expected-warning@-2 {{redundant same-type constraint 'Self.Element' == 'Self.Iterator.Element'}}
+}