Merge pull request #71395 from kavon/ncgenerics-test-fixes-kavon-v2

NCGenerics: more test fixes (v2)

Author: kavon

lib/AST/ASTPrinter.cpp

@@ -1581,9 +1581,16 @@ bestRequirementPrintLocation(ProtocolDecl *proto, const Requirement &req) {
 
 void PrintAST::printInheritedFromRequirementSignature(ProtocolDecl *proto,
                                                       TypeDecl *attachingTo) {
+  unsigned flags = PrintInherited;
+
+  // The invertible protocols themselves do not need to state inverses in their
+  // inheritance clause, because they do not gain any default requirements.
+  if (!proto->getInvertibleProtocolKind())
+    flags |= PrintInverseRequirements;
+
   printRequirementSignature(
       proto, proto->getRequirementSignature(),
-      PrintInherited | PrintInverseRequirements,
+      flags,
       attachingTo);
 }
 

lib/AST/ConformanceLookup.cpp

@@ -831,6 +831,8 @@ static bool conformsToInvertible(CanType type, InvertibleProtocolKind ip) {
   // Must not have a type parameter!
   assert(!type->hasTypeParameter() && "caller forgot to mapTypeIntoContext!");
 
+  assert(!type->hasUnboundGenericType() && "a UGT has no conformances!");
+
   assert(!type->is<PackExpansionType>());
 
   // The SIL types in the AST do not have real conformances, and should have

lib/Frontend/CompilerInvocation.cpp

@@ -2641,9 +2641,6 @@ static bool ParseIRGenArgs(IRGenOptions &Opts, ArgList &Args,
   if (Args.hasArg(OPT_no_clang_module_breadcrumbs))
     Opts.DisableClangModuleSkeletonCUs = true;
 
-  if (SWIFT_ENABLE_EXPERIMENTAL_NONCOPYABLE_GENERICS)
-    Opts.DisableRoundTripDebugTypes = true; // temporary until we fix mangling!
-
   if (auto A = Args.getLastArg(OPT_enable_round_trip_debug_types,
                                OPT_disable_round_trip_debug_types)) {
     Opts.DisableRoundTripDebugTypes =

lib/IRGen/IRGenDebugInfo.cpp

@@ -1817,6 +1817,10 @@ class IRGenDebugInfoImpl : public IRGenDebugInfo {
       // Emit the protocols the archetypes conform to.
       SmallVector<llvm::Metadata *, 4> Protocols;
       for (auto *ProtocolDecl : Archetype->getConformsTo()) {
+        // Skip marker protocols, as they are not available at runtime.
+        if (ProtocolDecl->isMarkerProtocol())
+          continue;
+
         auto PTy =
             IGM.getLoweredType(ProtocolDecl->getInterfaceType()).getASTType();
         auto PDbgTy = DebugTypeInfo::getFromTypeInfo(

lib/Sema/TypeCheckDecl.cpp

@@ -927,13 +927,12 @@ InvertibleAnnotationRequest::evaluate(Evaluator &evaluator,
 
   switch (TARGET) {
   case InvertibleProtocolKind::Copyable:
-    // Handle the legacy '@_moveOnly' attribute
-    if (auto attr = decl->getAttrs().getAttribute<MoveOnlyAttr>()) {
-      assert((isa<StructDecl, EnumDecl, ClassDecl>(decl)));
-
-      return InverseMarking::forInverse(Kind::LegacyExplicit,
-                                        attr->getLocation());
-    }
+    // Handle the legacy '@_moveOnly' for types they can validly appear.
+    // TypeCheckAttr handles the illegal situations for us.
+    if (auto attr = decl->getAttrs().getAttribute<MoveOnlyAttr>())
+      if (isa<StructDecl, EnumDecl, ClassDecl>(decl))
+        return InverseMarking::forInverse(Kind::LegacyExplicit,
+                                          attr->getLocation());
     break;
 
   case InvertibleProtocolKind::Escapable:
@@ -2559,7 +2558,8 @@ static Type validateParameterType(ParamDecl *decl) {
   }
 
   // Validate the presence of ownership for a parameter with an inverse applied.
-  if (diagnoseMissingOwnership(ctx, dc, ownership,
+  if (!Ty->hasUnboundGenericType() &&
+      diagnoseMissingOwnership(ctx, dc, ownership,
                                decl->getTypeRepr(), Ty, options)) {
     decl->setInvalid();
     return ErrorType::get(ctx);

stdlib/cmake/modules/SwiftSource.cmake

@@ -610,7 +610,6 @@ function(_compile_swift_files
   if(SWIFT_ENABLE_EXPERIMENTAL_NONCOPYABLE_GENERICS)
     list(APPEND swift_flags "-enable-experimental-feature" "NoncopyableGenerics")
     list(APPEND swift_flags "-Xfrontend" "-enable-experimental-associated-type-inference")
-    list(APPEND swift_flags "-Xfrontend" "-disable-round-trip-debug-types") # NOTE: temporary until we fix mangling!
   endif()
 
   if (SWIFT_STDLIB_ENABLE_STRICT_CONCURRENCY_COMPLETE)

test/ModuleInterface/invertible_protocols.swift

@@ -0,0 +1,20 @@
+// RUN: %target-swift-frontend %s \
+// RUN:     -swift-version 5 \
+// RUN:     -enable-library-evolution \
+// RUN:     -emit-module -module-name Swift -parse-stdlib \
+// RUN:     -enable-experimental-feature NoncopyableGenerics \
+// RUN:     -o %t/Swift.swiftmodule \
+// RUN:     -emit-module-interface-path %t/Swift.swiftinterface
+
+// RUN: %FileCheck %s < %t/Swift.swiftinterface
+
+// CHECK-DAG: @_marker public protocol Copyable {
+// CHECK-DAG: @_marker public protocol Escapable {
+
+// This test verifies that:
+//   1. When omitted, the an invertible protocol decl gets automatically
+//      synthesized into a module named Swift
+//   2. These protocol decls do not specify inverses in their inheritance clause
+//      when emitted into the interface file.
+
+@_marker public protocol Escapable { }