Properly propagate NS_UNAVAILABLE

This was not properly parsed, since `entity.get_availabilty()` returns
the availability for the current target, and not the attribute if it's
applied to the entire item.

This allows us to more correctly mark methods as (un)safe.

Author: madsmtm

crates/header-translator/src/availability.rs

@@ -3,9 +3,12 @@ use std::{
     fmt::{self, Display},
 };
 
-use clang::{Entity, PlatformAvailability, Version};
+use clang::{Entity, EntityKind, PlatformAvailability, Version};
 
-use crate::{context::Context, display_helper::FormatterFn};
+use crate::{
+    context::Context, display_helper::FormatterFn, immediate_children,
+    unexposed_attr::UnexposedAttr,
+};
 
 #[derive(Debug, Clone, PartialEq, Default)]
 struct Unavailable {
@@ -162,7 +165,7 @@ fn version_cmp(left: Version, right: Version) -> Ordering {
 }
 
 impl Availability {
-    pub fn parse(entity: &Entity<'_>, _context: &Context<'_>) -> Self {
+    pub fn parse(entity: &Entity<'_>, context: &Context<'_>) -> Self {
         let availabilities = entity
             .get_platform_availability()
             .expect("platform availability");
@@ -250,10 +253,16 @@ impl Availability {
             }
         }
 
+        // This is an unconditional attribute that overrides the platform
+        // availability for the current platform.
+        //
+        // Unfortunately, it is partially merged into the platform
+        // availability above, so it's kinda hard to know when it applies.
         let current_target_availability = entity.get_availability();
         match current_target_availability {
             clang::Availability::Available => {}
             clang::Availability::Deprecated => {
+                // TODO: Handle this better?
                 if deprecated == Versions::default() {
                     deprecated = Versions::MIN;
                 }
@@ -262,12 +271,19 @@ impl Availability {
                 error!(?entity, "cannot handle 'Inaccessible' availability")
             }
             clang::Availability::Unavailable => {
-                if unavailable == Unavailable::default() {
-                    // TODO: Set per-target.
+                // Handled below.
+            }
+        }
+
+        immediate_children(entity, |entity, _span| {
+            if let EntityKind::UnexposedAttr = entity.get_kind() {
+                if let Some(UnexposedAttr::FullyUnavailable) =
+                    UnexposedAttr::parse(&entity, context)
+                {
                     unavailable = Unavailable::ALL_UNAVAILABLE;
                 }
             }
-        }
+        });
 
         Self {
             unavailable,

crates/header-translator/src/method.rs

@@ -90,6 +90,9 @@ impl MethodModifiers {
                         UnexposedAttr::NoThrow => {
                             // TODO: Use this somehow?
                         }
+                        UnexposedAttr::FullyUnavailable => {
+                            // Handled in Availability::parse.
+                        }
                         attr => error!(?attr, "unknown attribute on method"),
                     }
                 }

crates/header-translator/src/rust_type.rs

@@ -1408,6 +1408,9 @@ impl Ty {
                 Some(UnexposedAttr::NoEscape) => {
                     no_escape = true;
                 }
+                Some(UnexposedAttr::FullyUnavailable) => {
+                    // Irrelevant on types.
+                }
                 Some(attr) => error!(?attr, "unknown attribute on type"),
                 None => {}
             }

crates/header-translator/src/unexposed_attr.rs

@@ -33,6 +33,8 @@ pub enum UnexposedAttr {
 
     NoEscape,
     NoThrow,
+
+    FullyUnavailable,
 }
 
 impl UnexposedAttr {
@@ -153,6 +155,18 @@ impl UnexposedAttr {
             "NS_REQUIRES_PROPERTY_DEFINITIONS" => None,
             // Weak specifiers - would be interesting if Rust supported weak statics
             "GK_EXTERN_WEAK" | "MC_EXTERN_WEAK" | "weak_import" => None,
+            // Some availability attributes are not properly exposed.
+            "NS_UNAVAILABLE"
+            | "UNAVAILABLE_ATTRIBUTE"
+            | "DISPATCH_UNAVAILABLE"
+            | "AV_INIT_UNAVAILABLE"
+            | "AVKIT_INIT_UNAVAILABLE"
+            | "MP_INIT_UNAVAILABLE"
+            | "VS_INIT_UNAVAILABLE" => Some(Self::FullyUnavailable),
+            // TODO: Add this to the above?
+            "CF_AUTOMATED_REFCOUNT_UNAVAILABLE"
+            | "NS_AUTOMATED_REFCOUNT_UNAVAILABLE"
+            | "NS_AUTOMATED_REFCOUNT_WEAK_UNAVAILABLE" => None,
             // Availability attributes - their data is already exposed.
             "__API_AVAILABLE"
             | "__API_DEPRECATED"
@@ -333,14 +347,12 @@ impl UnexposedAttr {
             | "__WATCHOS_UNAVAILABLE"
             | "__UNAVAILABLE_PUBLIC_IOS"
             | "APPKIT_API_UNAVAILABLE_BEGIN_MACCATALYST"
-            | "AVKIT_INIT_UNAVAILABLE"
             | "BROWSERENGINE_TEXTINPUT_AVAILABILITY"
             | "BROWSERENGINE_ACCESSIBILITY_AVAILABILITY"
             | "BROWSERENGINE_ACCESSIBILITY_MARKER_AVAILABILITY"
             | "BROWSERENGINE_ACCESSIBILITY_REMOTE_AVAILABILITY"
             | "CA_CANONICAL_DEPRECATED"
             | "CB_CM_API_AVAILABLE"
-            | "CF_AUTOMATED_REFCOUNT_UNAVAILABLE"
             | "CG_OBSOLETE"
             | "CK_SHARE_ACCESS_REQUESTER_AVAILABILITY"
             | "CK_SHARE_BLOCKED_IDENTITY_AVAILABILITY"
@@ -353,7 +365,6 @@ impl UnexposedAttr {
             | "DEPRECATED_ATTRIBUTE"
             | "DEPRECATED_ATTRIBUTE_EXCLUDE_PUBLIC_IOS"
             | "DEPRECATED_MSG_ATTRIBUTE"
-            | "DISPATCH_UNAVAILABLE"
             | "EN_API_AVAILABLE"
             | "EN_API_AVAILABLE_V2"
             | "EN_API_AVAILABLE_V3"
@@ -379,17 +390,11 @@ impl UnexposedAttr {
             | "MIDICI1_1"
             | "MIDICI1_2"
             | "MIDINETWORKSESSION_AVAILABLE"
-            | "MP_INIT_UNAVAILABLE"
-            | "NS_AUTOMATED_REFCOUNT_UNAVAILABLE"
-            | "NS_AUTOMATED_REFCOUNT_WEAK_UNAVAILABLE"
             | "NS_CLASS_AVAILABLE"
-            | "NS_UNAVAILABLE"
-            | "UNAVAILABLE_ATTRIBUTE"
             | "UT_AVAILABLE_BEGIN"
             | "MP_DEPRECATED_BEGIN"
             | "SEC_ASN1_API_DEPRECATED"
             | "SECUREDOWNLOAD_API_DEPRECATED"
-            | "VS_INIT_UNAVAILABLE"
             | "XCT_METRIC_API_AVAILABLE"
             | "XCUI_PROTECTED_RESOURCES_RESET_API_AVAILABLE" => None,
             s if s.starts_with("AVAILABLE_MAC_OS_X_VERSION_") => None,
@@ -435,8 +440,6 @@ impl UnexposedAttr {
                 None
             }
             "objc_non_runtime_protocol" => None,
-            // Emits unavailability attributes on `new` and `init` methods
-            "AV_INIT_UNAVAILABLE" => None,
             // Helper used to easy declare @interface in CompositorServices.
             "CP_OBJECT_DECL" => {
                 let _ = get_arguments();
@@ -446,6 +449,7 @@ impl UnexposedAttr {
             "XCT_WEAK_EXPORT" => None,
             // Irrelevant, we don't emit dispatch_object_t anyhow.
             "DISPATCH_TRANSPARENT_UNION" => None,
+            "NS_NO_TAIL_CALL" => None,
             _ => return Err(()),
         })
     }