diff options
| author | 2016-10-04 13:54:57 -0700 | |
|---|---|---|
| committer | 2016-10-13 10:59:28 -0700 | |
| commit | 28bd2e4f151267b34b8e1eb19c489d8d547bbf5c (patch) | |
| tree | d99ae3fe74ea63b83091898d830d3efe68cd479d /runtime/debugger.cc | |
| parent | 6e5fa09510c7280168e040382d27dd8b55760d9a (diff) | |
Move mirror::Class to use ObjPtr
Leave the return types as non ObjPtr for now. Fixed moving GC bugs
in tests.
Test: test-art-host
Bug: 31113334
Change-Id: I5da1b5ac55dfbc5cc97a64be2c870ba9f512d9b0
Diffstat (limited to 'runtime/debugger.cc')
| -rw-r--r-- | runtime/debugger.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/runtime/debugger.cc b/runtime/debugger.cc index ada1a237d6..3977e4926a 100644 --- a/runtime/debugger.cc +++ b/runtime/debugger.cc @@ -39,6 +39,7 @@ #include "handle_scope.h" #include "jdwp/jdwp_priv.h" #include "jdwp/object_registry.h" +#include "jvalue-inl.h" #include "mirror/class.h" #include "mirror/class-inl.h" #include "mirror/class_loader.h" @@ -1289,7 +1290,7 @@ JDWP::JdwpError Dbg::CreateObject(JDWP::RefTypeId class_id, JDWP::ObjectId* new_ return error; } Thread* self = Thread::Current(); - mirror::Object* new_object; + ObjPtr<mirror::Object> new_object; if (c->IsStringClass()) { // Special case for java.lang.String. gc::AllocatorType allocator_type = Runtime::Current()->GetHeap()->GetCurrentAllocator(); @@ -1304,7 +1305,7 @@ JDWP::JdwpError Dbg::CreateObject(JDWP::RefTypeId class_id, JDWP::ObjectId* new_ *new_object_id = 0; return JDWP::ERR_OUT_OF_MEMORY; } - *new_object_id = gRegistry->Add(new_object); + *new_object_id = gRegistry->Add(new_object.Ptr()); return JDWP::ERR_NONE; } |