Merge pull request #42238 from slavapestov/endifextension

Fix bogus ASTPrinter output with synthesized extension for conformance to protocol with primary associated types

Author: slavapestov

include/swift/AST/ASTPrinter.h

@@ -389,7 +389,7 @@ StringRef getAccessorKindString(AccessorKind value);
 /// for the compiler features that it uses.  Note that printBody
 /// may be called multiple times if the declaration uses suppressible
 /// features.
-bool printWithCompatibilityFeatureChecks(ASTPrinter &printer,
+void printWithCompatibilityFeatureChecks(ASTPrinter &printer,
                                          PrintOptions &options,
                                          Decl *decl,
                                          llvm::function_ref<void()> printBody);

include/swift/Basic/Features.def

@@ -74,7 +74,7 @@ LANGUAGE_FEATURE(BuiltinStackAlloc, 0, "Builtin.stackAlloc", true)
 SUPPRESSIBLE_LANGUAGE_FEATURE(SpecializeAttributeWithAvailability, 0, "@_specialize attribute with availability", true)
 LANGUAGE_FEATURE(BuiltinAssumeAlignment, 0, "Builtin.assumeAlignment", true)
 SUPPRESSIBLE_LANGUAGE_FEATURE(UnsafeInheritExecutor, 0, "@_unsafeInheritExecutor", true)
-SUPPRESSIBLE_LANGUAGE_FEATURE(PrimaryAssociatedTypes, 0, "Primary associated types", true)
+SUPPRESSIBLE_LANGUAGE_FEATURE(PrimaryAssociatedTypes, 346, "Primary associated types", true)
 SUPPRESSIBLE_LANGUAGE_FEATURE(UnavailableFromAsync, 0, "@_unavailableFromAsync", true)
 SUPPRESSIBLE_LANGUAGE_FEATURE(NoAsyncAvailability, 340, "@available(*, noasync)", true)
 

lib/AST/ASTPrinter.cpp

@@ -2588,12 +2588,12 @@ void PrintAST::printSynthesizedExtensionImpl(Type ExtendedType,
     //   protocol Foo {}
     //   extension Foo where <requirments from ExtDecl> { ... }
     //   struct Bar {}
-    //   extension Bar: Foo where <requirments from TransformContext> { ... }
+    //   extension Bar: Foo where <requirements from TransformContext> { ... }
     //
     // should produce a synthesized extension of Bar with both sets of
-    // requirments:
+    // requirements:
     //
-    //   extension Bar where <requirments from ExtDecl+TransformContext { ... }
+    //   extension Bar where <requirements from ExtDecl+TransformContext> { ... }
     //
     if (!printCombinedRequirementsIfNeeded())
       printDeclGenericRequirements(ExtDecl);
@@ -3208,21 +3208,21 @@ static void printWithSuppressibleFeatureChecks(ASTPrinter &printer,
 ///   #endif
 ///   #endif
 /// ```
-bool swift::printWithCompatibilityFeatureChecks(ASTPrinter &printer,
+void swift::printWithCompatibilityFeatureChecks(ASTPrinter &printer,
                                                 PrintOptions &options,
                                                 Decl *decl,
                                  llvm::function_ref<void()> printBody) {
   // A single accessor does not get a feature check,
   // it should go around the whole decl.
   if (isa<AccessorDecl>(decl)) {
     printBody();
-    return false;
+    return;
   }
 
   FeatureSet features = getUniqueFeaturesUsed(decl);
   if (features.empty()) {
     printBody();
-    return false;
+    return;
   }
 
   // Enter a `#if` for the required features, if any.
@@ -3252,8 +3252,6 @@ bool swift::printWithCompatibilityFeatureChecks(ASTPrinter &printer,
     printer.printNewline();
     printer << "#endif";
   }
-
-  return true;
 }
 
 void PrintAST::visitExtensionDecl(ExtensionDecl *decl) {

lib/Frontend/ModuleInterfaceSupport.cpp

@@ -650,17 +650,8 @@ class InheritedProtocolCollector {
         printer << " {}";
       };
 
-      bool printedNewline = false;
-      if (printOptions.PrintCompatibilityFeatureChecks) {
-        printedNewline =
-          printWithCompatibilityFeatureChecks(printer, curPrintOptions,
-                                              proto, printBody);
-      } else {
-        printBody();
-        printedNewline = false;
-      }
-      if (!printedNewline)
-        printer << "\n";
+      printBody();
+      printer << "\n";
     }
   }
 

test/ModuleInterface/parameterized-protocol-synthesized-extension.swift

@@ -0,0 +1,22 @@
+// RUN: %empty-directory(%t)
+// RUN: %target-swift-frontend -typecheck -module-name ParameterizedProtocols -emit-module-interface-path %t/ParameterizedProtocols.swiftinterface %s
+// RUN: %FileCheck %s < %t/ParameterizedProtocols.swiftinterface
+
+public struct S1 : P1 {
+  public typealias T = Int
+}
+
+public struct S2 : Q1 {}
+
+protocol P1 : P2 {}
+
+public protocol P2<T> {
+  associatedtype T
+}
+
+protocol Q1 : Q2 {}
+
+public protocol Q2 {}
+
+// CHECK: extension ParameterizedProtocols.S1 : ParameterizedProtocols.P2 {}
+// CHECK-NEXT: extension ParameterizedProtocols.S2 : ParameterizedProtocols.Q2 {}