diff options
| author | Roland Levillain <rpl@google.com> | 2017-06-08 18:03:48 +0100 |
|---|---|---|
| committer | Roland Levillain <rpl@google.com> | 2017-09-28 18:05:39 +0100 |
| commit | b77b698f4550458725b72d3a451adca765f369cc (patch) | |
| tree | edfc6a5b96325a6b4cdaa1a4e4428f1b677c7745 /runtime/quick_exception_handler.cc | |
| parent | e5b35ed787fbfb388d162361310bae5b0e7682a7 (diff) | |
Check the to-space invariant on a delivered exception.
Test: art/test/testrunner/testrunner.py
Bug: 62339341
Bug: 12687968
Change-Id: Ida5e91031cd94429a72fcc9d4d1333d21dd07421
Diffstat (limited to 'runtime/quick_exception_handler.cc')
| -rw-r--r-- | runtime/quick_exception_handler.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/runtime/quick_exception_handler.cc b/runtime/quick_exception_handler.cc index d8b62370b8..f94923e065 100644 --- a/runtime/quick_exception_handler.cc +++ b/runtime/quick_exception_handler.cc @@ -166,10 +166,9 @@ void QuickExceptionHandler::FindCatch(ObjPtr<mirror::Throwable> exception) { << line_number << ")"; } } - if (clear_exception_) { - // Exception was cleared as part of delivery. - DCHECK(!self_->IsExceptionPending()); - } else { + // Exception was cleared as part of delivery. + DCHECK(!self_->IsExceptionPending()); + if (!clear_exception_) { // Put exception back in root set with clear throw location. self_->SetException(exception_ref.Get()); } |