llvmorg-github-actions[bot] wrote:
<!--LLVM PR SUMMARY COMMENT--> @llvm/pr-subscribers-clang Author: Prajwal Nadig (snprajwal) <details> <summary>Changes</summary> 6c8940ccad31457aadb48c6f2bce139b1c5dda01 introduced support for anyAppleOS, which can be used to indicate availability for all Apple platforms in a single availability attribute. 3089120f0cd2fe78911d1bc9703764a07fa7eb32 updated it to preserve the original attribute info and store the inferred platform-specific attribute in a separate field which, if present, is returned by `getEffectiveAttr()`. With these changes, ExtractAPI now reports these availabilities verbatim for an "anyAppleOS" platform as the availability info for Decls directly uses the availability attribute without fetching the effective attribute. The expected output would be the target platform for which the symbol graph is being built. This patch updates the availability collection logic to use `getEffectiveAttr()` and include the target platform instead of "anyAppleOS" for symbol availabilities in symbol graphs. rdar://174558184 --- Full diff: https://github.com/llvm/llvm-project/pull/197929.diff 2 Files Affected: - (modified) clang/lib/AST/Availability.cpp (+4-2) - (added) clang/test/ExtractAPI/availability-anyappleos.c (+162) ``````````diff diff --git a/clang/lib/AST/Availability.cpp b/clang/lib/AST/Availability.cpp index cf040fc727d11..cd9152745826f 100644 --- a/clang/lib/AST/Availability.cpp +++ b/clang/lib/AST/Availability.cpp @@ -48,9 +48,11 @@ static void createInfoForDecl(const clang::Decl *Decl, // Collect availability attributes from all redeclarations. for (const auto *RD : Decl->redecls()) { for (const auto *A : RD->specific_attrs<clang::AvailabilityAttr>()) { + const auto *Eff = A->getEffectiveAttr(); Availabilities.insert(clang::AvailabilityInfo( - A->getPlatform()->getName(), A->getIntroduced(), A->getDeprecated(), - A->getObsoleted(), A->getUnavailable(), false, false)); + Eff->getPlatform()->getName(), Eff->getIntroduced(), + Eff->getDeprecated(), Eff->getObsoleted(), Eff->getUnavailable(), + false, false)); } if (const auto *A = RD->getAttr<clang::UnavailableAttr>()) diff --git a/clang/test/ExtractAPI/availability-anyappleos.c b/clang/test/ExtractAPI/availability-anyappleos.c new file mode 100644 index 0000000000000..ebac953147477 --- /dev/null +++ b/clang/test/ExtractAPI/availability-anyappleos.c @@ -0,0 +1,162 @@ +// RUN: rm -rf %t + +/* + * This test file looks slightly different from the other ones since the + * `anyAppleOS` availability attribute needs to be tested for multiple + * target platforms. To make the tests readable, the commands to build + * the symbol graphs and check the contained availability info have been + * grouped per-platform below. + */ + +void anyappleos_introduced(void) __attribute__((availability(anyAppleOS, introduced=26.0))); + +void anyappleos_all(void) __attribute__((availability(anyAppleOS, introduced=26.0, deprecated=27.0, obsoleted=28.0))); + +void anyappleos_unavailable(void) __attribute__((availability(anyAppleOS, unavailable))); + +void anyappleos_explicit_override(void) + __attribute__((availability(anyAppleOS, introduced=26.0))) + __attribute__((availability(macOS, introduced=27.0))); + +// expected-no-diagnostics + +// ========== macOS ========== +// RUN: %clang_cc1 -extract-api --pretty-sgf --emit-sgf-symbol-labels-for-testing -triple arm64-apple-macosx \ +// RUN: -x c-header %s -o %t/macos.symbols.json -verify +// RUN: FileCheck %s --input-file %t/macos.symbols.json --check-prefix MACOS + +// MACOS-LABEL: "!testLabel": "c:@F@anyappleos_introduced" +// MACOS: "availability": [ +// MACOS-NEXT: { +// MACOS-NEXT: "domain": "macos", +// MACOS-NEXT: "introduced": { +// MACOS-NEXT: "major": 26, +// MACOS-NEXT: "minor": 0, +// MACOS-NEXT: "patch": 0 +// MACOS-NEXT: } +// MACOS-NEXT: } +// MACOS-NEXT: ] + +// MACOS-LABEL: "!testLabel": "c:@F@anyappleos_all" +// MACOS: "availability": [ +// MACOS-NEXT: { +// MACOS-NEXT: "deprecated": { +// MACOS-NEXT: "major": 27, +// MACOS-NEXT: "minor": 0, +// MACOS-NEXT: "patch": 0 +// MACOS-NEXT: }, +// MACOS-NEXT: "domain": "macos", +// MACOS-NEXT: "introduced": { +// MACOS-NEXT: "major": 26, +// MACOS-NEXT: "minor": 0, +// MACOS-NEXT: "patch": 0 +// MACOS-NEXT: }, +// MACOS-NEXT: "obsoleted": { +// MACOS-NEXT: "major": 28, +// MACOS-NEXT: "minor": 0, +// MACOS-NEXT: "patch": 0 +// MACOS-NEXT: } +// MACOS-NEXT: } +// MACOS-NEXT: ] + +// MACOS-LABEL: "!testLabel": "c:@F@anyappleos_unavailable" +// MACOS: "availability": [ +// MACOS-NEXT: { +// MACOS-NEXT: "domain": "macos", +// MACOS-NEXT: "isUnconditionallyUnavailable": true +// MACOS-NEXT: } +// MACOS-NEXT: ] + +// MACOS-LABEL: "!testLabel": "c:@F@anyappleos_explicit_override" +// MACOS: "availability": [ +// MACOS-NEXT: { +// MACOS-NEXT: "domain": "macos", +// MACOS-NEXT: "introduced": { +// MACOS-NEXT: "major": 27, +// MACOS-NEXT: "minor": 0, +// MACOS-NEXT: "patch": 0 +// MACOS-NEXT: } +// MACOS-NEXT: } +// MACOS-NEXT: ] + +// ========== iOS ========== +// RUN: %clang_cc1 -extract-api --pretty-sgf --emit-sgf-symbol-labels-for-testing -triple arm64-apple-ios \ +// RUN: -x c-header %s -o %t/ios.symbols.json -verify +// RUN: FileCheck %s --input-file %t/ios.symbols.json --check-prefix IOS + +// IOS-LABEL: "!testLabel": "c:@F@anyappleos_introduced" +// IOS: "availability": [ +// IOS-NEXT: { +// IOS-NEXT: "domain": "ios", +// IOS-NEXT: "introduced": { +// IOS-NEXT: "major": 26, +// IOS-NEXT: "minor": 0, +// IOS-NEXT: "patch": 0 +// IOS-NEXT: } +// IOS-NEXT: } +// IOS-NEXT: ] + +// IOS-LABEL: "!testLabel": "c:@F@anyappleos_unavailable" +// IOS: "availability": [ +// IOS-NEXT: { +// IOS-NEXT: "domain": "ios", +// IOS-NEXT: "isUnconditionallyUnavailable": true +// IOS-NEXT: } +// IOS-NEXT: ] + +// IOS-LABEL: "!testLabel": "c:@F@anyappleos_explicit_override" +// IOS: "availability": [ +// IOS-NEXT: { +// IOS-NEXT: "domain": "ios", +// IOS-NEXT: "introduced": { +// IOS-NEXT: "major": 26, +// IOS-NEXT: "minor": 0, +// IOS-NEXT: "patch": 0 +// IOS-NEXT: } +// IOS-NEXT: } +// IOS-NEXT: ] + +// ========== tvOS ========== +// RUN: %clang_cc1 -extract-api --pretty-sgf --emit-sgf-symbol-labels-for-testing -triple arm64-apple-tvos \ +// RUN: -x c-header %s -o %t/tvos.symbols.json -verify +// RUN: FileCheck %s --input-file %t/tvos.symbols.json --check-prefix TVOS + +// TVOS-LABEL: "!testLabel": "c:@F@anyappleos_introduced" +// TVOS: "domain": "tvos" + +// ========== watchOS ========== +// RUN: %clang_cc1 -extract-api --pretty-sgf --emit-sgf-symbol-labels-for-testing -triple arm64-apple-watchos \ +// RUN: -x c-header %s -o %t/watchos.symbols.json -verify +// RUN: FileCheck %s --input-file %t/watchos.symbols.json --check-prefix WATCHOS + +// WATCHOS-LABEL: "!testLabel": "c:@F@anyappleos_introduced" +// WATCHOS: "domain": "watchos" + +// ========== xrOS ========== +// RUN: %clang_cc1 -extract-api --pretty-sgf --emit-sgf-symbol-labels-for-testing -triple arm64-apple-xros \ +// RUN: -x c-header %s -o %t/xros.symbols.json -verify +// RUN: FileCheck %s --input-file %t/xros.symbols.json --check-prefix XROS + +// XROS-LABEL: "!testLabel": "c:@F@anyappleos_introduced" +// XROS: "domain": "xros" + +// ========== macCatalyst ========== +/* + * The macCatalyst run does not use -verify because an explicit + * `availability(macos, ...)` attribute on a macabi triple emits an + * SDKSettings.json warning which is irrelevant to the test. + */ +// RUN: %clang_cc1 -extract-api --pretty-sgf --emit-sgf-symbol-labels-for-testing -triple arm64-apple-ios-macabi \ +// RUN: -x c-header %s -o %t/maccatalyst.symbols.json +// RUN: FileCheck %s --input-file %t/maccatalyst.symbols.json --check-prefix MACCATALYST + +// MACCATALYST-LABEL: "!testLabel": "c:@F@anyappleos_introduced" +// MACCATALYST: "domain": "maccatalyst" + +// ========== driverkit ========== +// RUN: %clang_cc1 -extract-api --pretty-sgf --emit-sgf-symbol-labels-for-testing -triple arm64-apple-driverkit \ +// RUN: -x c-header %s -o %t/driverkit.symbols.json -verify +// RUN: FileCheck %s --input-file %t/driverkit.symbols.json --check-prefix DRIVERKIT + +// DRIVERKIT-LABEL: "!testLabel": "c:@F@anyappleos_introduced" +// DRIVERKIT: "domain": "driverkit" `````````` </details> https://github.com/llvm/llvm-project/pull/197929 _______________________________________________ cfe-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
