diff options
| author | Sebastien Hertz <shertz@google.com> | 2014-10-29 12:06:51 +0100 |
|---|---|---|
| committer | Sebastien Hertz <shertz@google.com> | 2015-02-24 18:00:29 +0100 |
| commit | e4266c511ffe6a1ed472292bea06881dcbf06f7a (patch) | |
| tree | 107bf68179b24919f284246cba181a0113119660 | |
| parent | 0b6daeb0f0014474b542cbba1f713eb0dbefb7f9 (diff) | |
| download | art-e4266c511ffe6a1ed472292bea06881dcbf06f7a.tar.gz art-e4266c511ffe6a1ed472292bea06881dcbf06f7a.tar.bz2 art-e4266c511ffe6a1ed472292bea06881dcbf06f7a.zip | |
JDWP: assert no pending exception when using JNI
Checks there is no pending exception when creating new JDWP ids using
JNI routines. We can create JDWP ids when executing code and report
an event like a breakpoint.
Bug: 17491155
Change-Id: I4e5851bf2261510b7776a709a2388e7ff586a77c
| -rw-r--r-- | runtime/jdwp/object_registry.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/runtime/jdwp/object_registry.cc b/runtime/jdwp/object_registry.cc index e415c3d1c..99a005df2 100644 --- a/runtime/jdwp/object_registry.cc +++ b/runtime/jdwp/object_registry.cc @@ -49,6 +49,8 @@ JDWP::ObjectId ObjectRegistry::InternalAdd(mirror::Object* o) { } Thread* const self = Thread::Current(); + self->AssertNoPendingException(); + StackHandleScope<1> hs(self); Handle<mirror::Object> obj_h(hs.NewHandle(o)); |