diff options
author | 2015-05-08 10:31:05 +0000 | |
---|---|---|
committer | 2015-05-08 10:31:06 +0000 | |
commit | 2e8da8ecb94134081c3ea18a217294db367888a3 (patch) | |
tree | 87924829284955cfd3fa71cf28b34ecfc7f34c18 | |
parent | 659f4c14e8e044f8efe5405ba0da50aa894dd25f (diff) | |
parent | b5505823ad3d0bab8fc9c15c266a3d8cd96ee59e (diff) |
Merge "ART: Fix debug output for bad reused MemMap."
-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); |