https://github.com/ian-twilightcoder created https://github.com/llvm/llvm-project/pull/177749
Additional visionOS changes. >From 0851e375330c96d04294c6d81f2d9dc360269261 Mon Sep 17 00:00:00 2001 From: Ian Anderson <[email protected]> Date: Sat, 24 Jan 2026 01:46:33 -0800 Subject: [PATCH] [test][NFC] Add more keys to test SDKSettings files Additional visionOS changes. --- .../Sema/Inputs/XROS.sdk/SDKSettings.json | 21 -------------- .../Sema/Inputs/XROS1.0.sdk/SDKSettings.json | 29 +++++++++++++++++++ .../xrOS/Sema/infer-ios-availability.c | 6 ++-- ...le-from-missing-ios-availability-mapping.c | 2 +- 4 files changed, 33 insertions(+), 25 deletions(-) delete mode 100644 clang/test/PlatformSpecific/xrOS/Sema/Inputs/XROS.sdk/SDKSettings.json create mode 100644 clang/test/PlatformSpecific/xrOS/Sema/Inputs/XROS1.0.sdk/SDKSettings.json diff --git a/clang/test/PlatformSpecific/xrOS/Sema/Inputs/XROS.sdk/SDKSettings.json b/clang/test/PlatformSpecific/xrOS/Sema/Inputs/XROS.sdk/SDKSettings.json deleted file mode 100644 index e4f7c87519805..0000000000000 --- a/clang/test/PlatformSpecific/xrOS/Sema/Inputs/XROS.sdk/SDKSettings.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "DefaultVariant": "xrOS", "DisplayName": "xrOS", - "Version": "1.0", - "CanonicalName": "xros1.0", - "MaximumDeploymentTarget": "1.0.99", - "SupportedTargets": { - "xros": { - "Archs": ["arm64e", "arm64"], - "LLVMTargetTripleVendor": "apple", - "LLVMTargetTripleSys": "xros", - "LLVMTargetTripleEnvironment": "", - "SystemPrefix": "" - } - }, - "VersionMap": { - "iOS_visionOS": {"17.1": "1.0"}, - "iOS_xrOS": {"17.1": "1.0"}, - "visionOS_iOS": {"1.0": "17.1"}, - "xrOS_iOS": {"1.0": "17.1"} - } -} diff --git a/clang/test/PlatformSpecific/xrOS/Sema/Inputs/XROS1.0.sdk/SDKSettings.json b/clang/test/PlatformSpecific/xrOS/Sema/Inputs/XROS1.0.sdk/SDKSettings.json new file mode 100644 index 0000000000000..d67728c09351d --- /dev/null +++ b/clang/test/PlatformSpecific/xrOS/Sema/Inputs/XROS1.0.sdk/SDKSettings.json @@ -0,0 +1,29 @@ +{ + "CanonicalName": "xros1.0", + "Version": "1.0", + "IsBaseSDK": "YES", + "DisplayName": "visionOS 1.0", + "MinimalDisplayName": "1.0", + "SupportedTargets": { + "xros": { + "PlatformFamilyName": "xrOS", + "PlatformFamilyDisplayName": "visionOS", + "Archs": ["arm64e", "arm64"], "LLVMTargetTripleVendor": "apple", "LLVMTargetTripleSys": "xros", "LLVMTargetTripleEnvironment": "", + "BuildVersionPlatformID": "11", + "ClangRuntimeLibraryPlatformName": "xros", + "SystemPrefix": "", + "DefaultDeploymentTarget": "1.0", + "RecommendedDeploymentTarget": "1.0", + "MinimumDeploymentTarget": "1.0", "MaximumDeploymentTarget": "1.0.99", + "ValidDeploymentTargets": ["1.0"] + } + }, + "VersionMap": { + "visionOS_iOS": {"1.0": "17.1"}, + "iOS_visionOS": {"17.1": "1.0"}, + "xrOS_iOS": {"1.0": "17.1"}, + "iOS_xrOS": {"17.1": "1.0"} + }, + "DefaultDeploymentTarget": "1.0", + "MaximumDeploymentTarget": "1.0.99" +} diff --git a/clang/test/PlatformSpecific/xrOS/Sema/infer-ios-availability.c b/clang/test/PlatformSpecific/xrOS/Sema/infer-ios-availability.c index 76be32370e745..c19ed66a2583f 100644 --- a/clang/test/PlatformSpecific/xrOS/Sema/infer-ios-availability.c +++ b/clang/test/PlatformSpecific/xrOS/Sema/infer-ios-availability.c @@ -1,7 +1,7 @@ -// RUN: %clang_cc1 -triple arm64-apple-xros1 -verify=ios -isysroot %S/Inputs/XROS.sdk %s 2>&1 -// RUN: %clang_cc1 -triple arm64-apple-xros1 -fapplication-extension -verify=ios,ext -isysroot %S/Inputs/XROS.sdk %s 2>&1 +// RUN: %clang_cc1 -triple arm64-apple-xros1 -verify=ios -isysroot %S/Inputs/XROS1.0.sdk %s 2>&1 +// RUN: %clang_cc1 -triple arm64-apple-xros1 -fapplication-extension -verify=ios,ext -isysroot %S/Inputs/XROS1.0.sdk %s 2>&1 -// RUN: %clang_cc1 -triple arm64-apple-xros2 -DXROS2 -verify=ios -isysroot %S/Inputs/XROS.sdk %s 2>&1 +// RUN: %clang_cc1 -triple arm64-apple-xros2 -DXROS2 -verify=ios -isysroot %S/Inputs/XROS1.0.sdk %s 2>&1 __attribute__((availability(ios, unavailable))) void ios_unavail(); // ios-note {{}} diff --git a/clang/test/PlatformSpecific/xrOS/Sema/infer-unavailable-from-missing-ios-availability-mapping.c b/clang/test/PlatformSpecific/xrOS/Sema/infer-unavailable-from-missing-ios-availability-mapping.c index 2645b487ffd72..23c78aa3ff163 100644 --- a/clang/test/PlatformSpecific/xrOS/Sema/infer-unavailable-from-missing-ios-availability-mapping.c +++ b/clang/test/PlatformSpecific/xrOS/Sema/infer-unavailable-from-missing-ios-availability-mapping.c @@ -1,5 +1,5 @@ // RUN: %clang_cc1 -triple arm64-apple-xros1 -verify=ios -DNOSDK %s 2>&1 -// RUN: %clang_cc1 -triple arm64-apple-xros1 -verify=ios -isysroot %S/Inputs/XROS.sdk %s 2>&1 +// RUN: %clang_cc1 -triple arm64-apple-xros1 -verify=ios -isysroot %S/Inputs/XROS1.0.sdk %s 2>&1 #ifdef NOSDK // ios-warning@+2 {{ios availability is ignored without a valid 'SDKSettings.json' in the SDK}} _______________________________________________ cfe-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
