From 1e13374baf7dfaf442ffbf9809c37c131d681eaf Mon Sep 17 00:00:00 2001 From: Evgenii Stepanov Date: Wed, 20 May 2015 12:30:59 -0700 Subject: Generalize Valgrind annotations in ART to support ASan. Also add redzones around non-fixed mem_map(s). Also extend -Wframe-larger-than limit to enable arm64 ASan build. Change-Id: Ie572481a25fead59fc8978d2c317a33ac418516c --- runtime/gc/allocator/rosalloc.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'runtime/gc/allocator/rosalloc.h') diff --git a/runtime/gc/allocator/rosalloc.h b/runtime/gc/allocator/rosalloc.h index 0fcfe72b06..c356a39531 100644 --- a/runtime/gc/allocator/rosalloc.h +++ b/runtime/gc/allocator/rosalloc.h @@ -253,7 +253,7 @@ class RosAlloc { // Dump the run metadata for debugging. std::string Dump(); // Verify for debugging. - void Verify(Thread* self, RosAlloc* rosalloc, bool running_on_valgrind) + void Verify(Thread* self, RosAlloc* rosalloc, bool running_on_memory_tool) EXCLUSIVE_LOCKS_REQUIRED(Locks::mutator_lock_) EXCLUSIVE_LOCKS_REQUIRED(Locks::thread_list_lock_); @@ -503,7 +503,7 @@ class RosAlloc { const size_t page_release_size_threshold_; // Whether this allocator is running under Valgrind. - bool running_on_valgrind_; + bool is_running_on_memory_tool_; // The base address of the memory region that's managed by this allocator. uint8_t* Begin() { return base_; } @@ -561,7 +561,7 @@ class RosAlloc { public: RosAlloc(void* base, size_t capacity, size_t max_capacity, PageReleaseMode page_release_mode, - bool running_on_valgrind, + bool running_on_memory_tool, size_t page_release_size_threshold = kDefaultPageReleaseSizeThreshold); ~RosAlloc(); -- cgit v1.2.3-59-g8ed1b