Merge pull request #76411 from kavon/release/6.0-ncgenerics-opaque-dependent-conformance-mangling

[release/6.0] ASTMangler: skip mangling Copyable dependents

Author: kavon

lib/AST/ASTMangler.cpp

@@ -4196,12 +4196,26 @@ void ASTMangler::appendAnyProtocolConformance(
       conformance.getRequirement()->isMarkerProtocol())
     return;
 
+  // While all invertible protocols are marker protocols, do not mangle them
+  // as a dependent conformance. See `conformanceRequirementIndex` which skips
+  // these, too. In theory, invertible conformances should never be mangled,
+  // but we *might* have let that slip by for the other cases below, so the
+  // early-exits are highly conservative.
+  const bool forInvertible =
+      conformance.getRequirement()->getInvertibleProtocolKind().has_value();
+
   if (conformingType->isTypeParameter()) {
     assert(genericSig && "Need a generic signature to resolve conformance");
+    if (forInvertible)
+      return;
+
     auto path = genericSig->getConformancePath(conformingType,
                                                conformance.getAbstract());
     appendDependentProtocolConformance(path, genericSig);
   } else if (auto opaqueType = conformingType->getAs<OpaqueTypeArchetypeType>()) {
+    if (forInvertible)
+      return;
+
     GenericSignature opaqueSignature =
         opaqueType->getDecl()->getOpaqueInterfaceGenericSignature();
     ConformancePath conformancePath =

test/Interpreter/moveonly_generics_opaque.swift

@@ -0,0 +1,29 @@
+// RUN: %target-run-simple-swift(-Xfrontend -disable-availability-checking) | %FileCheck %s
+// RUN: %target-run-simple-swift(-Xfrontend -disable-availability-checking -O) | %FileCheck %s
+
+// REQUIRES: executable_test
+
+// UNSUPPORTED: use_os_stdlib
+// UNSUPPORTED: back_deployment_runtime
+
+protocol Marked {
+  func announce()
+}
+extension Marked {
+  func announce() { print("\(Self.self) is Marked") }
+}
+
+struct ConcreteWrapper<Wrapped> {}
+extension ConcreteWrapper: Marked where Wrapped: Marked {}
+
+struct Hello<T: ~Copyable> {}
+extension Hello: Marked {}
+
+func makeWrapper<P>(wrapping _: P.Type) -> some Marked {
+    ConcreteWrapper<Hello<P>>()
+}
+
+do {
+  let markedVal = makeWrapper(wrapping: String.self)
+  markedVal.announce() // CHECK: ConcreteWrapper<Hello<String>> is Marked
+}