commit 7fa55781338aeb404ecd9a1a22799f847680199e
author Andreas Gampe <agampe@google.com> Wed Jun 15 17:45:01 2016 -0700
committer Andreas Gampe <agampe@google.com> Wed Jun 15 18:20:29 2016 -0700
tree 3b4e60f5564ed8480d1f101a6ca1d3a9085fba66
parent 9e276662b57d0cc8b4e76afbdf00fae5ead882ee

ART: Fix ImageSpace::Init

Refactor ImageSpace::Init. Fix a case of using nullptr for error_msg
where it was unsafe. Instead fix the remaining case of verbose map
dumping.

Also fixes the stack frame size issue on x86-64.

Change-Id: I7d3ba05100592b5a44a29b34349edd8a44b4a72f

runtime/mem_map.cc

diff --git a/runtime/mem_map.cc b/runtime/mem_map.cc
index 771f8ed..1d501f7 100644
--- a/runtime/mem_map.cc
+++ b/runtime/mem_map.cc
@@ -339,7 +339,9 @@
 
   if (actual == MAP_FAILED) {
     if (error_msg != nullptr) {
-      PrintFileToLog("/proc/self/maps", LogSeverity::WARNING);
+      if (kIsDebugBuild || VLOG_IS_ON(oat)) {
+        PrintFileToLog("/proc/self/maps", LogSeverity::WARNING);
+      }
 
       *error_msg = StringPrintf("Failed anonymous mmap(%p, %zd, 0x%x, 0x%x, %d, 0): %s. "
                                     "See process maps in the log.",