ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Revert "Do not do local unwinds through .oat or .dex maps."" am: 9220b98fa5

Browse source 
am: aea086a79a

* commit 'aea086a79a57dc668b3431fdf2c5dce52b5cd0ed':
  Revert "Do not do local unwinds through .oat or .dex maps."
This commit is contained in:
Andreas Gampe 2016-03-02 22:51:36 +00:00 • committed by android-build-merger
commit fee8a7896c
1 changed files with 0 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
libbacktrace/UnwindCurrent.cpp
View file

@ -23,7 +23,6 @@
#define UNW_LOCAL_ONLY
#include <libunwind.h>
#include <android-base/strings.h>
#include <backtrace/Backtrace.h>
#include "BacktraceLog.h"
@ -125,16 +124,6 @@ bool UnwindCurrent::UnwindFromContext(size_t num_ignore_frames, ucontext_t* ucon
num_ignore_frames--;
}
}
// For now, do not attempt to do local unwinds through .dex, or .oat
// maps. We can only unwind through these if there is a compressed
// section available, almost all local unwinds are done by ART
// which will dump the Java frames separately.
// TODO: Come up with a flag to control this.
if (android::base::EndsWith(frame->map.name, ".dex")
|| android::base::EndsWith(frame->map.name, ".oat")) {
break;
}
ret = unw_step (cursor.get());
} while (ret > 0 && num_frames < MAX_BACKTRACE_FRAMES);