[clang][ExtractAPI] Update availability serialization in SGF #71418
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The prevailiing symbol graph parsing library expects availability attributes to just be "introduced" instead of "introducedVersion" rdar://117823923
|
@llvm/pr-subscribers-clang Author: Daniel Grumberg (daniel-grumberg) ChangesThe prevailiing symbol graph parsing library expects availability attributes to just be "introduced" instead of "introducedVersion" rdar://117823923 Full diff: https://github.com/llvm/llvm-project/pull/71418.diff 2 Files Affected:
diff --git a/clang/lib/ExtractAPI/Serialization/SymbolGraphSerializer.cpp b/clang/lib/ExtractAPI/Serialization/SymbolGraphSerializer.cpp
index 3c8668d26c60b76..f757522ef8e49db 100644
--- a/clang/lib/ExtractAPI/Serialization/SymbolGraphSerializer.cpp
+++ b/clang/lib/ExtractAPI/Serialization/SymbolGraphSerializer.cpp
@@ -177,11 +177,11 @@ 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 0c8cd3629f3fdee..5e3890df83563d4 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
|
daniel-grumberg
added a commit
to daniel-grumberg/llvm-project
that referenced
this pull request
Nov 7, 2023
This was referenced Nov 8, 2023
daniel-grumberg
added a commit
to swiftlang/llvm-project
that referenced
this pull request
Nov 8, 2023
daniel-grumberg
added a commit
to daniel-grumberg/llvm-project
that referenced
this pull request
Dec 20, 2023
daniel-grumberg
added a commit
to swiftlang/llvm-project
that referenced
this pull request
Jan 3, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The prevailiing symbol graph parsing library expects availability attributes to just be "introduced" instead of "introducedVersion"
rdar://117823923