Merge pull request #66150 from DougGregor/interfaces-without-macros-5.9

Author: DougGregor

include/swift/AST/PrintOptions.h

@@ -350,6 +350,9 @@ struct PrintOptions {
   /// prevent printing from doing "extra" work.
   bool PrintCurrentMembersOnly = false;
 
+  /// Whether to suppress printing of custom attributes that are expanded macros.
+  bool SuppressExpandedMacros = true;
+
   /// List of attribute kinds that should not be printed.
   std::vector<AnyAttrKind> ExcludeAttrList = {DAK_Transparent, DAK_Effects,
                                               DAK_FixedLayout,
@@ -658,6 +661,7 @@ struct PrintOptions {
     result.EnumRawValues = EnumRawValueMode::PrintObjCOnly;
     result.MapCrossImportOverlaysToDeclaringModule = true;
     result.PrintCurrentMembersOnly = false;
+    result.SuppressExpandedMacros = true;
     return result;
   }
 

lib/AST/Attr.cpp

@@ -790,6 +790,15 @@ void DeclAttributes::print(ASTPrinter &Printer, const PrintOptions &Options,
     if (Options.excludeAttrKind(DA->getKind()))
       continue;
 
+    // If we're supposed to suppress expanded macros, check whether this is
+    // a macro.
+    if (Options.SuppressExpandedMacros) {
+      if (auto customAttr = dyn_cast<CustomAttr>(DA)) {
+        if (D->getResolvedMacro(const_cast<CustomAttr *>(customAttr)))
+          continue;
+      }
+    }
+
     // If this attribute is only allowed because this is a Clang decl, don't
     // print it.
     if (D && D->hasClangNode()

test/Macros/macro_expand_conformances.swift

@@ -26,6 +26,7 @@ public struct PublicEquatable {
   public init() { }
 }
 
+// INTERFACE-NOT: @Equatable
 // INTERFACE: public struct PublicEquatable
 // INTERFACE: extension ModuleWithEquatable.PublicEquatable : Swift.Equatable
 

test/ModuleInterface/Observable.swift

@@ -0,0 +1,24 @@
+// RUN: %empty-directory(%t)
+// RUN: %target-swift-emit-module-interface(%t/Library.swiftinterface) %s -module-name Library -plugin-path %swift-host-lib-dir/plugins -disable-availability-checking
+// RUN: %target-swift-typecheck-module-from-interface(%t/Library.swiftinterface) -module-name Library -disable-availability-checking
+// RUN: %FileCheck %s < %t/Library.swiftinterface
+
+// REQUIRES: swift_swift_parser
+
+import _Observation
+
+// CHECK-NOT: @Observable
+// CHECK-NOT: @ObservationIgnored
+// CHECK-NOT: @ObservationTracked
+
+@Observable
+public class SomeClass {
+  public var field = 3
+  @ObservationIgnored public var ignored = 4
+}
+
+public func requiresObservable<T: Observable>(_: T) { }
+
+@inlinable func useObservable(sc: SomeClass) {
+  requiresObservable(sc)
+}