Merge pull request #71504 from kavon/ncgenerics-test-fixes-kavon-v6

Ncgenerics test fixes kavon v6

Author: kavon

lib/AST/Type.cpp

@@ -3999,14 +3999,25 @@ CanType ProtocolCompositionType::getMinimalCanonicalType(
   // represent the minimal composition.
   auto sig = useDC->getGenericSignatureOfContext();
   const auto Sig = Ctx.getOpenedExistentialSignature(CanTy, sig);
-  const auto &Reqs = Sig.getRequirements();
+  SmallVector<Requirement, 2> Reqs;
+  SmallVector<InverseRequirement, 2> Inverses;
+  Sig->getRequirementsWithInverses(Reqs, Inverses);
+
   if (Reqs.size() == 1) {
     return Reqs.front().getSecondType()->getCanonicalType();
   }
 
   // The set of inverses is already minimal.
   auto MinimalInverses = Composition->getInverses();
 
+#ifndef NDEBUG
+  // Check that the generic signature's inverses matches.
+  InvertibleProtocolSet genSigInverses;
+  for (InverseRequirement ireq : Inverses)
+    genSigInverses.insert(ireq.getKind());
+  assert(genSigInverses == MinimalInverses);
+#endif
+
   llvm::SmallVector<Type, 2> MinimalMembers;
   bool MinimalHasExplicitAnyObject = false;
   auto ifaceTy = Sig.getGenericParams().back();

test/Parse/inverses.swift

@@ -100,4 +100,4 @@ typealias Z5 = (~Int) -> Void // expected-error {{type 'Int' is not invertible}}
 typealias Z6 = ~() -> () // expected-error {{single argument function types require parentheses}}
                          // expected-error@-1 {{type '()' is not invertible}}
 typealias Z7 = ~(Copyable & Hashable) // expected-error {{type 'Hashable' is not invertible}}
-typealias Z8 = ~Copyable & Hashable
+typealias Z8 = ~Copyable & Hashable // expected-error {{composition cannot contain '~Copyable' when another member requires 'Copyable'}}

test/SILOptimizer/llvm_arc.sil

@@ -7,6 +7,7 @@
 sil_stage canonical
 
 import Builtin
+import Swift
 
 typealias AnyObject = Builtin.AnyObject