Merge pull request #79463 from swiftlang/145061506

ABI checker: avoid diagnosing missing availability info for decls that are only explicitly available on visionOS

Author: nkcsgexi

include/swift/APIDigester/ModuleAnalyzerNodes.h

@@ -335,9 +335,11 @@ struct PlatformIntroVersion {
   StringRef ios;
   StringRef tvos;
   StringRef watchos;
+  StringRef visionos;
   StringRef swift;
   bool hasOSAvailability() const {
-    return !macos.empty() || !ios.empty() || !tvos.empty() || !watchos.empty();
+    return !macos.empty() || !ios.empty() || !tvos.empty() ||
+      !watchos.empty() || !visionos.empty();
   }
 };
 

include/swift/IDE/DigesterEnums.def

@@ -157,6 +157,7 @@ KEY_STRING(IntromacOS, intro_Macosx)
 KEY_STRING(IntroiOS, intro_iOS)
 KEY_STRING(IntrotvOS, intro_tvOS)
 KEY_STRING(IntrowatchOS, intro_watchOS)
+KEY_STRING(IntrovisionOS, intro_visionOS)
 KEY_STRING(Introswift, intro_swift)
 KEY_STRING(ObjCName, objc_name)
 KEY_STRING(InitKind, init_kind)

lib/APIDigester/ModuleAnalyzerNodes.cpp

@@ -130,7 +130,7 @@ SDKNodeDecl::SDKNodeDecl(SDKNodeInitInfo Info, SDKNodeKind Kind)
         SugaredGenericSig(Info.SugaredGenericSig),
         FixedBinaryOrder(Info.FixedBinaryOrder),
         introVersions({Info.IntromacOS, Info.IntroiOS, Info.IntrotvOS,
-                       Info.IntrowatchOS, Info.Introswift}),
+                       Info.IntrowatchOS, Info.IntrovisionOS, Info.Introswift}),
         ObjCName(Info.ObjCName) {}
 
 SDKNodeType::SDKNodeType(SDKNodeInitInfo Info, SDKNodeKind Kind):
@@ -1468,6 +1468,7 @@ SDKNodeInitInfo::SDKNodeInitInfo(SDKContext &Ctx, Decl *D):
       IntroiOS(Ctx.getPlatformIntroVersion(D, PlatformKind::iOS)),
       IntrotvOS(Ctx.getPlatformIntroVersion(D, PlatformKind::tvOS)),
       IntrowatchOS(Ctx.getPlatformIntroVersion(D, PlatformKind::watchOS)),
+      IntrovisionOS(Ctx.getPlatformIntroVersion(D, PlatformKind::visionOS)),
       Introswift(Ctx.getLanguageIntroVersion(D)),
       ObjCName(Ctx.getObjcName(D)),
       InitKind(Ctx.getInitKind(D)),

test/api-digester/Inputs/cake_current/cake.swift

@@ -227,6 +227,11 @@ public class Zoo {
   public func getCurrentAnimalInlinable() -> [some Animal] {
     return [Dog()]
   }
+
+  @available(visionOS 1.50.4, *)
+  public func getAnimailOnVision() -> [some Animal] {
+    return [Dog()]
+  }
 }
 
 public func returnFunctionTypeOwnershipChange() -> (__owned C1) -> () { return { _ in } }