Sema: Only warn about @_originallyDefinedIn attributes on non-public decls for the active platform. This prevents diagnostic spam for the common case where multiple platforms are listed in the same attribute. This has the unfortunate side effect that some useful diagnostics will be skipped depending on target platform, but it makes the behavior of this diagnostic consistent with the rest for this attribute.

Resolves rdar://90779221.

Author: tshortli

lib/Sema/TypeCheckAttr.cpp

@@ -3475,11 +3475,12 @@ void AttributeChecker::checkOriginalDefinedInAttrs(
   for (auto *Attr: Attrs) {
     static StringRef AttrName = "_originallyDefinedIn";
 
-    if (diagnoseAndRemoveAttrIfDeclIsNonPublic(Attr, /*isError=*/false))
+    if (!Attr->isActivePlatform(Ctx))
       continue;
 
-    if (!Attr->isActivePlatform(Ctx))
+    if (diagnoseAndRemoveAttrIfDeclIsNonPublic(Attr, /*isError=*/false))
       continue;
+
     auto AtLoc = Attr->AtLoc;
     auto Platform = Attr->Platform;
     if (!seenPlatforms.insert({Platform, AtLoc}).second) {

test/Parse/original_defined_in_attr.swift

@@ -34,15 +34,19 @@ public class ToplevelClass4 {
 
 @available(OSX 13.10, *)
 @_originallyDefinedIn(module: "foo", OSX 13.13) // expected-warning {{'@_originallyDefinedIn' does not have any effect on internal declarations}}
-@_originallyDefinedIn(module: "foo", iOS 7.0) // expected-warning {{'@_originallyDefinedIn' does not have any effect on internal declarations}}
+@_originallyDefinedIn(module: "foo", iOS 7.0)
 internal class ToplevelClass5 {}
 
 @available(OSX 13.10, *)
 @_originallyDefinedIn(module: "foo", OSX 13.13) // expected-warning {{'@_originallyDefinedIn' does not have any effect on private declarations}}
-@_originallyDefinedIn(module: "foo", iOS 7.0) // expected-warning {{'@_originallyDefinedIn' does not have any effect on private declarations}}
+@_originallyDefinedIn(module: "foo", iOS 7.0)
 private class ToplevelClass6 {}
 
 @available(OSX 13.10, *)
 @_originallyDefinedIn(module: "foo", OSX 13.13) // expected-warning {{'@_originallyDefinedIn' does not have any effect on fileprivate declarations}}
-@_originallyDefinedIn(module: "foo", iOS 7.0) // expected-warning {{'@_originallyDefinedIn' does not have any effect on fileprivate declarations}}
+@_originallyDefinedIn(module: "foo", iOS 7.0)
 fileprivate class ToplevelClass7 {}
+
+@available(OSX 13.10, *)
+@_originallyDefinedIn(module: "foo", OSX 13.13, iOS 7.0) // expected-warning {{'@_originallyDefinedIn' does not have any effect on internal declarations}}
+internal class ToplevelClass8 {}