RequirementMachine: Canonicalize protocol list in RequirementMachine::getLocalRequirements()

Author: slavapestov

lib/AST/RequirementMachine/GenericSignatureQueries.cpp

@@ -75,6 +75,8 @@ RequirementMachine::getLocalRequirements(
   for (const auto *proto : props->getConformsTo())
     result.protos.push_back(const_cast<ProtocolDecl *>(proto));
 
+  ProtocolType::canonicalizeProtocols(result.protos);
+
   result.layout = props->getLayoutConstraint();
 
   return result;

test/IDE/complete_type_relation_global_results.swift

@@ -2,8 +2,6 @@
 // RUN: %empty-directory(%t/ImportPath)
 // RUN: %{python} %utils/split_file.py -o %t %s
 
-// XFAIL: noncopyable_generics
-
 // RUN: %target-swift-frontend -disable-availability-checking -emit-module %t/Lib.swift -o %t/ImportPath/Lib.swiftmodule -emit-module-interface-path %t/ImportPath/Lib.swiftinterface
 
 // BEGIN Lib.swift

test/Sema/type_eraser.swift

@@ -1,7 +1,5 @@
 // RUN: %target-swift-frontend -typecheck -disable-availability-checking -dump-ast %s | %FileCheck %s
 
-// XFAIL: noncopyable_generics
-
 class AnyP: P {
   init<T: P>(erasing: T) {}
 }
@@ -43,7 +41,7 @@ func testNoDynamic() -> some P {
 dynamic func testNoOpaque() -> P {
   // CHECK: erasure_expr implicit type="any P"
   // CHECK-NEXT: normal_conformance type="ConcreteP" protocol="P"
-  // CHECK-NEXT: call_expr type="ConcreteP"
+  // CHECK: call_expr type="ConcreteP"
   ConcreteP()
 }
 

test/Sema/type_eraser_experimental_flag.swift

@@ -1,7 +1,5 @@
 // RUN: %target-swift-frontend -typecheck -disable-availability-checking -dump-ast -enable-experimental-opaque-type-erasure %s | %FileCheck %s
 
-// XFAIL: noncopyable_generics
-
 class AnyP: P {
   init<T: P>(erasing: T) {}
 }