[asan] Fix Windows i386 regression #73650
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
|
@llvm/pr-subscribers-compiler-rt-sanitizer Author: Farzon Lotfi (farzonl) ChangesThis change makes x64 enablement case explicit. Full diff: https://github.com/llvm/llvm-project/pull/73650.diff 1 Files Affected:
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_platform.h b/compiler-rt/lib/sanitizer_common/sanitizer_platform.h
index 49d8a67cc12db3f..e816702ce582e7c 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_platform.h
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform.h
@@ -263,7 +263,7 @@
#if SANITIZER_WINDOWS64 && SANITIZER_ARM64
# define SANITIZER_WINDOWS_ARM64 1
# define SANITIZER_WINDOWS_x64 0
-#else
+#if SANITIZER_WINDOWS64 && !SANITIZER_ARM64
# define SANITIZER_WINDOWS_ARM64 0
# define SANITIZER_WINDOWS_x64 1
#endif
|
|
✅ With the latest revision this PR passed the C/C++ code formatter. |
farzonl
force-pushed
the
bugfix/i386-asan
branch
3 times, most recently
from
09654d2
to
b87fae8
Compare
farzonl
force-pushed
the
bugfix/i386-asan
branch
2 times, most recently
from
5a0b965
to
0451746
Compare
|
The change looks ok, but please improve the commit message (the PR description); at least reference the commit that caused the regression, and add tags to indicate the scope of the commit, e.g. “[asan]” at the start of the subject. And please spell out “windows”, not “window “. |
farzonl
changed the title
farzonl
force-pushed
the
bugfix/i386-asan
branch
from
0451746
to
ef73a45
Compare
|
@mstorsjo I don't have permissions to add tags. I completed all the other requests. |
This change makes x64 enablement case explicit and adds an else case for 32bit which fixes a regression on Windows i386 asan builds introduced by llvm#66973.
farzonl
force-pushed
the
bugfix/i386-asan
branch
from
ef73a45
to
68a376f
Compare
mstorsjo
approved these changes
Nov 28, 2023
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 change makes x64 enablement case explicit and
adds an else case for 32bit which fixes a regression
on Windows i386 asan builds introduced
by #66973.