Merge pull request #40196 from nkcsgexi/85426499

Author: nkcsgexi

lib/Frontend/ModuleInterfaceSupport.cpp

@@ -301,8 +301,10 @@ class InheritedProtocolCollector {
   static const StringLiteral DummyProtocolName;
 
   using AvailableAttrList = TinyPtrVector<const AvailableAttr *>;
+  using OtherAttrList = TinyPtrVector<const DeclAttribute*>;
   using ProtocolAndAvailability =
-    std::tuple<ProtocolDecl *, AvailableAttrList, bool /*isUnchecked*/>;
+    std::tuple<ProtocolDecl *, AvailableAttrList, bool /*isUnchecked*/,
+    OtherAttrList>;
 
   /// Protocols that will be included by the ASTPrinter without any extra work.
   SmallVector<ProtocolDecl *, 8> IncludedProtocols;
@@ -338,6 +340,17 @@ class InheritedProtocolCollector {
     return cache.getValue();
   }
 
+  static OtherAttrList getOtherAttrList(const Decl *D) {
+    OtherAttrList results;
+    while (D) {
+      for (auto *result: D->getAttrs().getAttributes<OriginallyDefinedInAttr>()) {
+        results.push_back(result);
+      }
+      D = D->getDeclContext()->getAsDecl();
+    }
+    return results;
+  }
+
   static bool canPrintProtocolTypeNormally(Type type, const Decl *D) {
     return isPublicOrUsableFromInline(type);
   }
@@ -369,7 +382,8 @@ class InheritedProtocolCollector {
           ExtraProtocols.push_back(
             ProtocolAndAvailability(protoTy->getDecl(),
                                     getAvailabilityAttrs(D, availableAttrs),
-                                    inherited.isUnchecked));
+                                    inherited.isUnchecked,
+                                    getOtherAttrList(D)));
       }
       // FIXME: This ignores layout constraints, but currently we don't support
       // any of those besides 'AnyObject'.
@@ -389,7 +403,8 @@ class InheritedProtocolCollector {
         ExtraProtocols.push_back(
           ProtocolAndAvailability(conf->getProtocol(),
                                   getAvailabilityAttrs(D, availableAttrs),
-                                  isUncheckedConformance(conf)));
+                                  isUncheckedConformance(conf),
+                                  getOtherAttrList(D)));
       }
     }
   }
@@ -550,6 +565,7 @@ class InheritedProtocolCollector {
       auto proto = std::get<0>(protoAndAvailability);
       auto availability = std::get<1>(protoAndAvailability);
       auto isUnchecked = std::get<2>(protoAndAvailability);
+      auto otherAttrs = std::get<3>(protoAndAvailability);
       proto->walkInheritedProtocols(
           [&](ProtocolDecl *inherited) -> TypeWalker::Action {
         if (!handledProtocols.insert(inherited).second)
@@ -571,7 +587,8 @@ class InheritedProtocolCollector {
             conformanceDeclaredInModule(M, nominal, inherited) &&
             !M->isImportedImplementationOnly(inherited->getParentModule())) {
           protocolsToPrint.push_back(
-            ProtocolAndAvailability(inherited, availability, isUnchecked));
+            ProtocolAndAvailability(inherited, availability, isUnchecked,
+                                    otherAttrs));
           return TypeWalker::Action::SkipChildren;
         }
 
@@ -586,6 +603,7 @@ class InheritedProtocolCollector {
       auto proto = std::get<0>(protoAndAvailability);
       auto availability = std::get<1>(protoAndAvailability);
       auto isUnchecked = std::get<2>(protoAndAvailability);
+      auto otherAttrs = std::get<3>(protoAndAvailability);
 
       bool haveFeatureChecks = printOptions.PrintCompatibilityFeatureChecks &&
         printCompatibilityFeatureChecksPre(printer, proto);
@@ -595,6 +613,7 @@ class InheritedProtocolCollector {
       attrs.insert(attrs.end(), availability.begin(), availability.end());
       auto spiAttributes = proto->getAttrs().getAttributes<SPIAccessControlAttr>();
       attrs.insert(attrs.end(), spiAttributes.begin(), spiAttributes.end());
+      attrs.insert(attrs.end(), otherAttrs.begin(), otherAttrs.end());
       DeclAttributes::print(printer, printOptions, attrs);
 
       printer << "extension ";

test/ModuleInterface/originally-defined-attr-synthesized-extension.swift

@@ -0,0 +1,25 @@
+// RUN: %empty-directory(%t)
+
+// Ensure the originallyDefinedIn attribute is printed in swiftinterface files for synthesized extensions
+// RUN: %target-swift-frontend-typecheck -emit-module-interface-path %t/Foo.swiftinterface %s -module-name Foo
+// RUN: %FileCheck %s < %t/Foo.swiftinterface
+
+@available(OSX 10.7, iOS 7.0, *)
+@_originallyDefinedIn(module: "Bar", OSX 10.9, iOS 13.0)
+public enum MyCase: Int {
+	case first
+	case second
+}
+
+// CHECK: @_originallyDefinedIn(module: "Bar", macOS 10.9)
+// CHECK: @_originallyDefinedIn(module: "Bar", iOS 13.0)
+// CHECK: public enum MyCase : Swift.Int
+
+// CHECK: @_originallyDefinedIn(module: "Bar", macOS 10.9)
+// CHECK: @_originallyDefinedIn(module: "Bar", iOS 13.0)
+// CHECK: extension Foo.MyCase : Swift.Equatable {}
+
+// CHECK: @_originallyDefinedIn(module: "Bar", macOS 10.9)
+// CHECK: @_originallyDefinedIn(module: "Bar", iOS 13.0)
+// CHECK: extension Foo.MyCase : Swift.Hashable {}
+