diff options
author | Vladimir Marko <vmarko@google.com> | 2015-05-08 11:10:16 +0100 |
---|---|---|
committer | Vladimir Marko <vmarko@google.com> | 2015-05-08 11:34:43 +0100 |
commit | 8ee43e3ce18e90bfbf8cbeb05ff78ad281015d1a (patch) | |
tree | cb1cb175f45d28d691644e33044164499b90b3ff /runtime/mem_map.cc | |
parent | 5eae455507399286c845ba54796c47087a72b3e2 (diff) | |
download | art-8ee43e3ce18e90bfbf8cbeb05ff78ad281015d1a.tar.gz art-8ee43e3ce18e90bfbf8cbeb05ff78ad281015d1a.tar.bz2 art-8ee43e3ce18e90bfbf8cbeb05ff78ad281015d1a.zip |
ART: Fix debug output for bad reused MemMap.
Log the error_msg instead of a pointer to it.
Raise the log level to ERROR for the process maps.
(cherry picked from commit b5505823ad3d0bab8fc9c15c266a3d8cd96ee59e)
Change-Id: Ib0c258961e2384125907aca4bae2108f36067d5f
Diffstat (limited to 'runtime/mem_map.cc')
-rw-r--r-- | runtime/mem_map.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/runtime/mem_map.cc b/runtime/mem_map.cc index 959bb75c93..a5f73418e5 100644 --- a/runtime/mem_map.cc +++ b/runtime/mem_map.cc @@ -153,7 +153,7 @@ static bool ContainedWithinExistingMap(uint8_t* ptr, size_t size, return true; } } - PrintFileToLog("/proc/self/maps", LogSeverity::WARNING); + PrintFileToLog("/proc/self/maps", LogSeverity::ERROR); *error_msg = StringPrintf("Requested region 0x%08" PRIxPTR "-0x%08" PRIxPTR " does not overlap " "any existing map. See process maps in the log.", begin, end); return false; @@ -256,7 +256,7 @@ MemMap* MemMap::MapAnonymous(const char* name, uint8_t* expected_ptr, size_t byt // Only use this if you actually made the page reservation yourself. CHECK(expected_ptr != nullptr); - DCHECK(ContainedWithinExistingMap(expected_ptr, byte_count, error_msg)) << error_msg; + DCHECK(ContainedWithinExistingMap(expected_ptr, byte_count, error_msg)) << *error_msg; flags |= MAP_FIXED; } @@ -411,7 +411,7 @@ MemMap* MemMap::MapFileAtAddress(uint8_t* expected_ptr, size_t byte_count, int p // Only use this if you actually made the page reservation yourself. CHECK(expected_ptr != nullptr); - DCHECK(ContainedWithinExistingMap(expected_ptr, byte_count, error_msg)) << error_msg; + DCHECK(ContainedWithinExistingMap(expected_ptr, byte_count, error_msg)) << *error_msg; flags |= MAP_FIXED; } else { CHECK_EQ(0, flags & MAP_FIXED); |