diff options
| author | Andreas Gampe <agampe@google.com> | 2014-07-25 13:36:56 -0700 |
|---|---|---|
| committer | Andreas Gampe <agampe@google.com> | 2014-07-25 13:36:56 -0700 |
| commit | 6ec8ebd178ed39aa09e4c7fad194900114c4121a (patch) | |
| tree | d618cd60098c59e6955ee19cb877b41aa7247753 /runtime/monitor.cc | |
| parent | 9c81c0cb0dc8c8d8ae5dca3d2d82b0eec7af589f (diff) | |
| download | art-6ec8ebd178ed39aa09e4c7fad194900114c4121a.tar.gz art-6ec8ebd178ed39aa09e4c7fad194900114c4121a.tar.bz2 art-6ec8ebd178ed39aa09e4c7fad194900114c4121a.zip | |
ART: Clean up API after change 102631
This adds an abort_on_error parameter to GetCurrentMethod, which is
by default true. This restores all previous behavior, except for
monitor installation, where it follows 101639.
Bug: 16556938
Change-Id: I9a12b9a21ccb9f558c86236bb58d15ff2fafaec0
Diffstat (limited to 'runtime/monitor.cc')
| -rw-r--r-- | runtime/monitor.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/runtime/monitor.cc b/runtime/monitor.cc index aee30868ed..371a9d9dd6 100644 --- a/runtime/monitor.cc +++ b/runtime/monitor.cc @@ -165,7 +165,9 @@ bool Monitor::Install(Thread* self) { bool success = GetObject()->CasLockWordWeakSequentiallyConsistent(lw, fat); // Lock profiling. if (success && owner_ != nullptr && lock_profiling_threshold_ != 0) { - locking_method_ = owner_->GetCurrentMethod(&locking_dex_pc_); + // Do not abort on dex pc errors. This can easily happen when we want to dump a stack trace on + // abort. + locking_method_ = owner_->GetCurrentMethod(&locking_dex_pc_, false); } return success; } |