[clang] Add __has_extension(swiftcc) support
#85347
Merged
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
llvmbot
added
clang
|
@llvm/pr-subscribers-clang Author: Yuta Saito (kateinoigakukun) ChangesThis patch adds This support is necessary to fix apple/swift#72343 Full diff: https://github.com/llvm/llvm-project/pull/85347.diff 2 Files Affected:
diff --git a/clang/include/clang/Basic/Features.def b/clang/include/clang/Basic/Features.def
index 7c0755b7318306..81fd14aea9a417 100644
--- a/clang/include/clang/Basic/Features.def
+++ b/clang/include/clang/Basic/Features.def
@@ -102,6 +102,9 @@ FEATURE(memory_sanitizer,
FEATURE(thread_sanitizer, LangOpts.Sanitize.has(SanitizerKind::Thread))
FEATURE(dataflow_sanitizer, LangOpts.Sanitize.has(SanitizerKind::DataFlow))
FEATURE(scudo, LangOpts.Sanitize.hasOneOf(SanitizerKind::Scudo))
+FEATURE(swiftcc,
+ PP.getTargetInfo().checkCallingConvention(CC_Swift) ==
+ clang::TargetInfo::CCCR_OK)
FEATURE(swiftasynccc,
PP.getTargetInfo().checkCallingConvention(CC_SwiftAsync) ==
clang::TargetInfo::CCCR_OK)
diff --git a/clang/test/Sema/swift-call-conv.c b/clang/test/Sema/swift-call-conv.c
index 755c18f5183f85..c40e433ce06b81 100644
--- a/clang/test/Sema/swift-call-conv.c
+++ b/clang/test/Sema/swift-call-conv.c
@@ -1,7 +1,12 @@
// RUN: %clang_cc1 -triple aarch64-unknown-windows-msvc -fsyntax-only %s -verify
// RUN: %clang_cc1 -triple thumbv7-unknown-windows-msvc -fsyntax-only %s -verify
// RUN: %clang_cc1 -triple x86_64-unknown-windows-msvc -fsyntax-only %s -verify
+// RISC-V does not support swiftcall
+// RUN: %clang_cc1 -triple riscv32-unknown-elf -fsyntax-only %s -verify
+#if __has_feature(swiftcc)
// expected-no-diagnostics
-
+#else
+// expected-warning@+2 {{'__swiftcall__' calling convention is not supported for this target}}
+#endif
void __attribute__((__swiftcall__)) f(void) {}
|
aschwaighofer
requested changes
Mar 15, 2024
There was a problem hiding this comment.
In a past review (#72159), @AaronBallman noted that the existing use of FEATURE (as in FEATURE(swiftasynccc,...) was not the right qualifier to use. And it should have been an EXTENSION instead. We should use EXTENSION for the swiftcc check.
Quoting from the top of the file:
// FEATURE(...) should be used to advertise support for standard language
// features, whereas EXTENSION(...) should be used for clang extensions. Note
// that many of the identifiers in this file don't follow this rule for backward
// compatibility reasons.
| @@ -102,6 +102,9 @@ FEATURE(memory_sanitizer, | |||
| FEATURE(thread_sanitizer, LangOpts.Sanitize.has(SanitizerKind::Thread)) | |||
| FEATURE(dataflow_sanitizer, LangOpts.Sanitize.has(SanitizerKind::DataFlow)) | |||
| FEATURE(scudo, LangOpts.Sanitize.hasOneOf(SanitizerKind::Scudo)) | |||
| FEATURE(swiftcc, | |||
There was a problem hiding this comment.
I think we should use EXTENSION instead of FEATURE.
There was a problem hiding this comment.
You should also add documentation for this to https://github.com/llvm/llvm-project/blob/main/clang/docs/LanguageExtensions.rst and a release note for the change in https://github.com/llvm/llvm-project/blob/main/clang/docs/ReleaseNotes.rst.
kateinoigakukun
force-pushed
the
katei/add-swiftcc-feature-upstream
branch
from
65c4b28
to
50da3b8
Compare
kateinoigakukun
changed the title
__has_feature(swiftcc) support__has_extension(swiftcc) support
|
Oh, I didn't see the past discussion. Thanks! |
kateinoigakukun
force-pushed
the
katei/add-swiftcc-feature-upstream
branch
from
50da3b8
to
f9b6687
Compare
rjmccall
approved these changes
Mar 18, 2024
compnerd
approved these changes
Mar 19, 2024
This patch adds `swiftcc` extension to check if the target supports Swift calling convention as well as we do for `swiftasynccc`. Also `swiftasynccc` is now considered to be a Clang extension rather than a language standard feature to reflect the nature of the attribute.
kateinoigakukun
force-pushed
the
katei/add-swiftcc-feature-upstream
branch
from
f9b6687
to
6ebb363
Compare
|
Do you need someone to commit this on your behalf? |
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.
This patch adds
swiftccfeature to check if the target supports Swift calling convention as well as we do forswiftasynccc.This support is necessary to fix apple/swift#72343