diff --git a/clang/lib/ExtractAPI/Serialization/SymbolGraphSerializer.cpp b/clang/lib/ExtractAPI/Serialization/SymbolGraphSerializer.cpp index 26f65325ec20b6..ec8e59524893d6 100644 --- a/clang/lib/ExtractAPI/Serialization/SymbolGraphSerializer.cpp +++ b/clang/lib/ExtractAPI/Serialization/SymbolGraphSerializer.cpp @@ -172,11 +172,11 @@ Optional serializeAvailability(const AvailabilitySet &Availabilities) { if (AvailInfo.Unavailable) Availability["isUnconditionallyUnavailable"] = true; else { - serializeObject(Availability, "introducedVersion", + serializeObject(Availability, "introduced", serializeSemanticVersion(AvailInfo.Introduced)); - serializeObject(Availability, "deprecatedVersion", + serializeObject(Availability, "deprecated", serializeSemanticVersion(AvailInfo.Deprecated)); - serializeObject(Availability, "obsoletedVersion", + serializeObject(Availability, "obsoleted", serializeSemanticVersion(AvailInfo.Obsoleted)); } AvailabilityArray.emplace_back(std::move(Availability)); diff --git a/clang/test/ExtractAPI/availability.c b/clang/test/ExtractAPI/availability.c index 7d071909a092e0..d4df2fd2b344b3 100644 --- a/clang/test/ExtractAPI/availability.c +++ b/clang/test/ExtractAPI/availability.c @@ -127,7 +127,7 @@ void e(void) __attribute__((availability(tvos, unavailable))); "availability": [ { "domain": "macos", - "introducedVersion": { + "introduced": { "major": 12, "minor": 0, "patch": 0 @@ -200,18 +200,18 @@ void e(void) __attribute__((availability(tvos, unavailable))); "accessLevel": "public", "availability": [ { - "deprecatedVersion": { + "deprecated": { "major": 12, "minor": 0, "patch": 0 }, "domain": "macos", - "introducedVersion": { + "introduced": { "major": 11, "minor": 0, "patch": 0 }, - "obsoletedVersion": { + "obsoleted": { "major": 20, "minor": 0, "patch": 0 @@ -284,18 +284,18 @@ void e(void) __attribute__((availability(tvos, unavailable))); "accessLevel": "public", "availability": [ { - "deprecatedVersion": { + "deprecated": { "major": 12, "minor": 0, "patch": 0 }, "domain": "macos", - "introducedVersion": { + "introduced": { "major": 11, "minor": 0, "patch": 0 }, - "obsoletedVersion": { + "obsoleted": { "major": 20, "minor": 0, "patch": 0 @@ -303,7 +303,7 @@ void e(void) __attribute__((availability(tvos, unavailable))); }, { "domain": "ios", - "introducedVersion": { + "introduced": { "major": 13, "minor": 0, "patch": 0 @@ -311,7 +311,7 @@ void e(void) __attribute__((availability(tvos, unavailable))); }, { "domain": "tvos", - "introducedVersion": { + "introduced": { "major": 15, "minor": 0, "patch": 0 @@ -389,7 +389,7 @@ void e(void) __attribute__((availability(tvos, unavailable))); }, { "domain": "macos", - "introducedVersion": { + "introduced": { "major": 11, "minor": 0, "patch": 0