diff options
| author | 2015-03-05 10:40:17 +0000 | |
|---|---|---|
| committer | 2015-03-09 10:09:33 +0000 | |
| commit | 14691c5e786e8c2c5734f687e4c96217340771be (patch) | |
| tree | 7c2156671b323c70ffdd1d48d5e2f1d1de79c5fc /runtime/mirror/class.cc | |
| parent | 3d7d2af4c6502b771b032ee9bf3ab30e78f9c60d (diff) | |
Compute the right catch location for the debugger.
Also remove tls ThrowLocation, it is not needed anymore.
Change-Id: I78fddf09ce968ca475e39c17fa76d699c589c8d9
Diffstat (limited to 'runtime/mirror/class.cc')
| -rw-r--r-- | runtime/mirror/class.cc | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/runtime/mirror/class.cc b/runtime/mirror/class.cc index 96b15dd676..6f4ef60e85 100644 --- a/runtime/mirror/class.cc +++ b/runtime/mirror/class.cc @@ -77,13 +77,9 @@ void Class::SetStatus(Status new_status, Thread* self) { << "Attempt to set as erroneous an already erroneous class " << PrettyClass(this); // Stash current exception. - StackHandleScope<3> hs(self); - ThrowLocation old_throw_location; - Handle<mirror::Throwable> old_exception(hs.NewHandle(self->GetException(&old_throw_location))); + StackHandleScope<1> hs(self); + Handle<mirror::Throwable> old_exception(hs.NewHandle(self->GetException())); CHECK(old_exception.Get() != nullptr); - Handle<mirror::Object> old_throw_this_object(hs.NewHandle(old_throw_location.GetThis())); - Handle<mirror::ArtMethod> old_throw_method(hs.NewHandle(old_throw_location.GetMethod())); - uint32_t old_throw_dex_pc = old_throw_location.GetDexPc(); Class* eiie_class; // Do't attempt to use FindClass if we have an OOM error since this can try to do more // allocations and may cause infinite loops. @@ -109,9 +105,7 @@ void Class::SetStatus(Status new_status, Thread* self) { } // Restore exception. - ThrowLocation gc_safe_throw_location(old_throw_this_object.Get(), old_throw_method.Get(), - old_throw_dex_pc); - self->SetException(gc_safe_throw_location, old_exception.Get()); + self->SetException(old_exception.Get()); } static_assert(sizeof(Status) == sizeof(uint32_t), "Size of status not equal to uint32"); if (Runtime::Current()->IsActiveTransaction()) { |