[compiler-rt] r345983 - [NFC] Refactor initialisation of Darwin malloc zone fields into separate function called `InitMallocZoneFields()` which is now called from `ReplaceSystemMalloc()`.
Dan Liew via llvm-commits
llvm-commits at lists.llvm.org
Fri Nov 2 08:28:12 PDT 2018
Author: delcypher
Date: Fri Nov 2 08:28:11 2018
New Revision: 345983
URL: http://llvm.org/viewvc/llvm-project?rev=345983&view=rev
Log:
[NFC] Refactor initialisation of Darwin malloc zone fields into separate function called `InitMallocZoneFields()` which is now called from `ReplaceSystemMalloc()`.
Summary:
The motivation here is to be able support initialisation of the
malloc zone on other code paths.
rdar://problem/45284065
Reviewers: kubamracek, george.karpenkov
Subscribers: llvm-commits, #sanitizers
Differential Revision: https://reviews.llvm.org/D54037
Modified:
compiler-rt/trunk/lib/sanitizer_common/sanitizer_malloc_mac.inc
Modified: compiler-rt/trunk/lib/sanitizer_common/sanitizer_malloc_mac.inc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_malloc_mac.inc?rev=345983&r1=345982&r2=345983&view=diff
==============================================================================
--- compiler-rt/trunk/lib/sanitizer_common/sanitizer_malloc_mac.inc (original)
+++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_malloc_mac.inc Fri Nov 2 08:28:11 2018
@@ -302,7 +302,7 @@ boolean_t mi_zone_locked(malloc_zone_t *
namespace COMMON_MALLOC_NAMESPACE {
-void ReplaceSystemMalloc() {
+void InitMallocZoneFields() {
static malloc_introspection_t sanitizer_zone_introspection;
// Ok to use internal_memset, these places are not performance-critical.
internal_memset(&sanitizer_zone_introspection, 0,
@@ -335,6 +335,10 @@ void ReplaceSystemMalloc() {
sanitizer_zone.free_definite_size = 0;
sanitizer_zone.memalign = &__sanitizer_mz_memalign;
sanitizer_zone.introspect = &sanitizer_zone_introspection;
+}
+
+void ReplaceSystemMalloc() {
+ InitMallocZoneFields();
// Register the zone.
malloc_zone_register(&sanitizer_zone);
More information about the llvm-commits
mailing list