Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

[scudo] Remove hard-coded use of AndroidConfig. #66845

Merged
merged 1 commit into from
Sep 20, 2023

Conversation

cferris1000
Copy link
Contributor

The bionic wrappers hard-coded use of AndroidConfig. This overrides the custom config code, so remove the hard-coding.

The bionic wrappers hard-coded use of AndroidConfig. This overrides
the custom config code, so remove the hard-coding.
@llvmbot
Copy link
Collaborator

llvmbot commented Sep 20, 2023

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

Changes

The bionic wrappers hard-coded use of AndroidConfig. This overrides the custom config code, so remove the hard-coding.


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

1 Files Affected:

  • (modified) compiler-rt/lib/scudo/standalone/wrappers_c_bionic.cpp (+1-1)
diff --git a/compiler-rt/lib/scudo/standalone/wrappers_c_bionic.cpp b/compiler-rt/lib/scudo/standalone/wrappers_c_bionic.cpp
index 4e8e37ac293b86a..4fed44779b9020d 100644
--- a/compiler-rt/lib/scudo/standalone/wrappers_c_bionic.cpp
+++ b/compiler-rt/lib/scudo/standalone/wrappers_c_bionic.cpp
@@ -27,7 +27,7 @@
 
 extern "C" void SCUDO_PREFIX(malloc_postinit)();
 SCUDO_REQUIRE_CONSTANT_INITIALIZATION
-static scudo::Allocator<scudo::AndroidConfig, SCUDO_PREFIX(malloc_postinit)>
+static scudo::Allocator<scudo::Config, SCUDO_PREFIX(malloc_postinit)>
     SCUDO_ALLOCATOR;
 
 #include "wrappers_c.inc"

@cferris1000 cferris1000 merged commit 93e12f1 into llvm:main Sep 20, 2023
4 checks passed
@cferris1000 cferris1000 deleted the android_config branch September 20, 2023 20:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants