Merge pull request #71592 from kavon/ncgenerics-test-fixes-kavon-v12

Ncgenerics test fixes kavon v12

Author: kavon

lib/Sema/CSDiagnostics.cpp

@@ -4575,7 +4575,17 @@ bool UnintendedExtraGenericParamMemberFailure::diagnoseAsError() {
   SourceLoc loc = genericTy->getDecl()->getSourceRange().End;
   StringRef replacement;
 
-  if (archetype->getConformsTo().size()) {
+  // FIXME: this won't handle an explicit Copyable written in source, but it's
+  // close enough.
+  bool conformsToAnExplicitRequirement = false;
+  for (auto proto : archetype->getConformsTo()) {
+    if (proto->getInvertibleProtocolKind())
+      continue;
+    conformsToAnExplicitRequirement = true;
+    break;
+  }
+
+  if (conformsToAnExplicitRequirement) {
     loc = loc.getAdvancedLoc(
         archetype->getConformsTo().back()->getName().getLength());
     replacement = " &";