diff options
| -rw-r--r-- | runtime/debugger.cc | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/runtime/debugger.cc b/runtime/debugger.cc index 8009b1b108..cbdf3dc636 100644 --- a/runtime/debugger.cc +++ b/runtime/debugger.cc @@ -4097,17 +4097,10 @@ void Dbg::ExecuteMethodWithoutPendingException(ScopedObjectAccess& soa, DebugInv // unless we threw, in which case we return null. DCHECK_EQ(JDWP::JT_VOID, result_tag); if (exceptionObjectId == 0) { - if (m->GetDeclaringClass()->IsStringClass()) { - // For string constructors, the new string is remapped to the receiver (stored in ref). - mirror::Object* decoded_ref = soa.Self()->DecodeJObject(ref.get()); - result_value = gRegistry->Add(decoded_ref); - result_tag = TagFromObject(soa, decoded_ref); - } else { - // TODO we could keep the receiver ObjectId in the DebugInvokeReq to avoid looking into the - // object registry. - result_value = GetObjectRegistry()->Add(pReq->receiver.Read()); - result_tag = TagFromObject(soa, pReq->receiver.Read()); - } + // TODO we could keep the receiver ObjectId in the DebugInvokeReq to avoid looking into the + // object registry. + result_value = GetObjectRegistry()->Add(pReq->receiver.Read()); + result_tag = TagFromObject(soa, pReq->receiver.Read()); } else { result_value = 0; result_tag = JDWP::JT_OBJECT; |