Skip to content

[compiler-rt] Allow Fuchsia to use 64-bit allocator for RISCV #68343

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged

Conversation

PiJoules
Copy link
Contributor

@PiJoules PiJoules commented Oct 5, 2023

The allocator should be tuned well enough for Fuchsia+RISCV.

The allocator should be tuned well enough for Fuchsia+RISCV.
@llvmbot
Copy link
Member

llvmbot commented Oct 5, 2023

@llvm/pr-subscribers-compiler-rt-sanitizer

Changes

The allocator should be tuned well enough for Fuchsia+RISCV.


Full diff: https://github.com/llvm/llvm-project/pull/68343.diff

1 Files Affected:

  • (modified) compiler-rt/lib/sanitizer_common/sanitizer_platform.h (+2-1)
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_platform.h b/compiler-rt/lib/sanitizer_common/sanitizer_platform.h
index c1ca5c9ca44783b..903a71210286e00 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_platform.h
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform.h
@@ -284,7 +284,8 @@
 // For such platforms build this code with -DSANITIZER_CAN_USE_ALLOCATOR64=0 or
 // change the definition of SANITIZER_CAN_USE_ALLOCATOR64 here.
 #ifndef SANITIZER_CAN_USE_ALLOCATOR64
-#  if SANITIZER_RISCV64 || SANITIZER_IOS || SANITIZER_DRIVERKIT
+#  if (SANITIZER_RISCV64 && !SANITIZER_FUCHSIA) || SANITIZER_IOS || \
+      SANITIZER_DRIVERKIT
 #    define SANITIZER_CAN_USE_ALLOCATOR64 0
 #  elif defined(__mips64) || defined(__hexagon__)
 #    define SANITIZER_CAN_USE_ALLOCATOR64 0

@PiJoules PiJoules merged commit a4d51e5 into llvm:main Oct 6, 2023
PiJoules added a commit that referenced this pull request Oct 9, 2023
…#68343)"

This reverts commit a4d51e5.

Reverting since this breaks the lsan-test on fuchsia riscv builders. I
had adjusted settings for the 64-bit allocator for asan, but forgot
about standalone lsan and need to do that also.
PiJoules added a commit that referenced this pull request Oct 24, 2023
#68343)"

This reverts commit 37432c1.

The tunings for the lsan allocator for Fuchsia on RISCV should be
adjusted.
# for free to join this conversation on GitHub. Already have an account? # to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants