diff --git a/clang/include/clang/ExtractAPI/AvailabilityInfo.h b/clang/include/clang/ExtractAPI/AvailabilityInfo.h --- a/clang/include/clang/ExtractAPI/AvailabilityInfo.h +++ b/clang/include/clang/ExtractAPI/AvailabilityInfo.h @@ -33,12 +33,14 @@ VersionTuple Introduced; VersionTuple Deprecated; VersionTuple Obsoleted; + bool Unavailable; AvailabilityInfo() = default; AvailabilityInfo(StringRef Domain, VersionTuple I, VersionTuple D, - VersionTuple O) - : Domain(Domain), Introduced(I), Deprecated(D), Obsoleted(O) {} + VersionTuple O, bool U) + : Domain(Domain), Introduced(I), Deprecated(D), Obsoleted(O), + Unavailable(U) {} }; class AvailabilitySet { diff --git a/clang/lib/ExtractAPI/AvailabilityInfo.cpp b/clang/lib/ExtractAPI/AvailabilityInfo.cpp --- a/clang/lib/ExtractAPI/AvailabilityInfo.cpp +++ b/clang/lib/ExtractAPI/AvailabilityInfo.cpp @@ -42,8 +42,8 @@ Availability->Obsoleted = Attr->getObsoleted(); } else { Availabilities.emplace_back(Domain, Attr->getIntroduced(), - Attr->getDeprecated(), - Attr->getObsoleted()); + Attr->getDeprecated(), Attr->getObsoleted(), + Attr->getUnavailable()); } } } diff --git a/clang/lib/ExtractAPI/Serialization/SymbolGraphSerializer.cpp b/clang/lib/ExtractAPI/Serialization/SymbolGraphSerializer.cpp --- a/clang/lib/ExtractAPI/Serialization/SymbolGraphSerializer.cpp +++ b/clang/lib/ExtractAPI/Serialization/SymbolGraphSerializer.cpp @@ -171,12 +171,16 @@ for (const auto &AvailInfo : Availabilities) { Object Availability; Availability["domain"] = AvailInfo.Domain; - serializeObject(Availability, "introducedVersion", - serializeSemanticVersion(AvailInfo.Introduced)); - serializeObject(Availability, "deprecatedVersion", - serializeSemanticVersion(AvailInfo.Deprecated)); - serializeObject(Availability, "obsoletedVersion", - serializeSemanticVersion(AvailInfo.Obsoleted)); + if (AvailInfo.Unavailable) + Availability["isUnconditionallyUnavailable"] = true; + else { + serializeObject(Availability, "introducedVersion", + serializeSemanticVersion(AvailInfo.Introduced)); + serializeObject(Availability, "deprecatedVersion", + serializeSemanticVersion(AvailInfo.Deprecated)); + serializeObject(Availability, "obsoletedVersion", + serializeSemanticVersion(AvailInfo.Obsoleted)); + } AvailabilityArray.emplace_back(std::move(Availability)); } diff --git a/clang/test/ExtractAPI/availability.c b/clang/test/ExtractAPI/availability.c --- a/clang/test/ExtractAPI/availability.c +++ b/clang/test/ExtractAPI/availability.c @@ -26,6 +26,9 @@ void f(void) __attribute__((unavailable)) __attribute__((availability(macos, introduced=11.0))); void d(void) __attribute__((availability(tvos, introduced=15.0))); + +void e(void) __attribute__((availability(tvos, unavailable))); + ///expected-no-diagnostics //--- reference.output.json.in @@ -391,6 +394,10 @@ "minor": 0, "patch": 0 } + }, + { + "domain": "tvos", + "isUnconditionallyUnavailable": true } ], "declarationFragments": [