Don't use CLANG_VERSION_MAJOR to check that the value passed to -fclang-abi-compat= is valid #123998
Conversation
This file contains hidden or 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
-fclang-abi-compat= is valid Use LLVM_VERSION_MAJOR instead as the maximum allowed value. This change is needed to fix regression tests that fail when vendors set CLANG_VERSION_MAJOR to a value that is lower than LLVM_VERSION_MAJOR when building the compiler. For example, clang/test/CodeGenCXX/mangle-concept.cpp fails with the following error if -DCLANG_VERSION_MAJOR=17 is passed to cmake: invalid value '19' in '-fclang-abi-compat=19'
llvmbot
added
clang
|
@llvm/pr-subscribers-clang Author: Akira Hatanaka (ahatanak) ChangesUse LLVM_VERSION_MAJOR instead as the maximum allowed value. This change is needed to fix regression tests that fail For example, clang/test/CodeGenCXX/mangle-concept.cpp fails with the following error if -DCLANG_VERSION_MAJOR=17 invalid value '19' in '-fclang-abi-compat=19' Full diff: https://github.com/llvm/llvm-project/pull/123998.diff 3 Files Affected:
diff --git a/clang/CMakeLists.txt b/clang/CMakeLists.txt
index b79e570667b2c4..4a18ecf8d2a757 100644
--- a/clang/CMakeLists.txt
+++ b/clang/CMakeLists.txt
@@ -331,6 +331,7 @@ if(NOT DEFINED CLANG_VERSION_SUFFIX)
set(CLANG_VERSION_SUFFIX ${LLVM_VERSION_SUFFIX})
endif()
set(CLANG_VERSION "${CLANG_VERSION_MAJOR}.${CLANG_VERSION_MINOR}.${CLANG_VERSION_PATCHLEVEL}${CLANG_VERSION_SUFFIX}")
+set(MAX_CLANG_ABI_COMPAT_VERSION "${LLVM_VERSION_MAJOR}")
message(STATUS "Clang version: ${CLANG_VERSION}")
# Configure the Version.inc file.
diff --git a/clang/include/clang/Basic/Version.inc.in b/clang/include/clang/Basic/Version.inc.in
index 370da8506d1425..69c79d03861cd2 100644
--- a/clang/include/clang/Basic/Version.inc.in
+++ b/clang/include/clang/Basic/Version.inc.in
@@ -4,3 +4,4 @@
#define CLANG_VERSION_MAJOR_STRING "@CLANG_VERSION_MAJOR@"
#define CLANG_VERSION_MINOR @CLANG_VERSION_MINOR@
#define CLANG_VERSION_PATCHLEVEL @CLANG_VERSION_PATCHLEVEL@
+#define MAX_CLANG_ABI_COMPAT_VERSION @MAX_CLANG_ABI_COMPAT_VERSION@
diff --git a/clang/lib/Frontend/CompilerInvocation.cpp b/clang/lib/Frontend/CompilerInvocation.cpp
index d711df02ce9503..09eb0517544a27 100644
--- a/clang/lib/Frontend/CompilerInvocation.cpp
+++ b/clang/lib/Frontend/CompilerInvocation.cpp
@@ -4387,7 +4387,7 @@ bool CompilerInvocation::ParseLangArgs(LangOptions &Opts, ArgList &Args,
// y or y.0 (4 <= y <= current version).
if (!VerParts.first.starts_with("0") &&
!VerParts.first.getAsInteger(10, Major) && 3 <= Major &&
- Major <= CLANG_VERSION_MAJOR &&
+ Major <= MAX_CLANG_ABI_COMPAT_VERSION &&
(Major == 3
? VerParts.second.size() == 1 &&
!VerParts.second.getAsInteger(10, Minor)
|
chapuni
added a commit
that referenced
this pull request
Jan 29, 2025
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/153/builds/21266 Here is the relevant piece of the build log for the reference |
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.
Use LLVM_VERSION_MAJOR instead as the maximum allowed value. This change is needed to fix regression tests that fail
when vendors set CLANG_VERSION_MAJOR to a value that is lower than LLVM_VERSION_MAJOR when building the
compiler.
For example, clang/test/CodeGenCXX/mangle-concept.cpp fails with the following error if -DCLANG_VERSION_MAJOR=17
is passed to cmake:
invalid value '19' in '-fclang-abi-compat=19'