From 422f4733ce76eda8f4ebb5a3dce5c0a5a2264886 Mon Sep 17 00:00:00 2001 From: Christopher Ferris Date: Mon, 4 Aug 2014 17:15:21 -0700 Subject: [PATCH] Use the uncached form of BacktraceMap::Create. The code assumes that calling BacktraceMap::Create creates a map based on the current state of the maps. This is not true by default, so call the Create function indicating we want an uncached BacktraceMap object. (cherry picked from 27a10f618357cf85cc0677a04f0a5a3a8a437aed) Change-Id: Ic7a2dedaea9950174b24ede4dcda30ffe036fe93 --- runtime/mem_map.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/runtime/mem_map.cc b/runtime/mem_map.cc index 1074253fe..438bee994 100644 --- a/runtime/mem_map.cc +++ b/runtime/mem_map.cc @@ -153,9 +153,9 @@ static bool CheckMapRequest(byte* expected_ptr, void* actual_ptr, size_t byte_co uintptr_t expected = reinterpret_cast(expected_ptr); uintptr_t limit = expected + byte_count; - std::unique_ptr map(BacktraceMap::Create(getpid())); - if (!map->Build()) { - *error_msg << StringPrintf("Failed to build process map to determine why mmap returned " + std::unique_ptr map(BacktraceMap::Create(getpid(), true)); + if (map.get() == NULL) { + *error_msg << StringPrintf("Failed to create process map to determine why mmap returned " "0x%08" PRIxPTR " instead of 0x%08" PRIxPTR, actual, expected); return false; -- 2.11.0