commit a3e1377f3f389a33f6a283796ea5cea1583911f3
author Sebastien Hertz <shertz@google.com> Thu Nov 05 12:09:44 2015 +0100
committer Sebastien Hertz <shertz@google.com> Thu Nov 05 15:50:45 2015 +0100
tree 4e78b7db0e3a8f3b58321bf2bcabe8231f369ec7
parent 55a77ef5f99c2b056eb5f2820c1ff3b29c0ec270

JDWP: fix returned tag for ClassType.NewInstance

Bug: 25490662
Change-Id: I0c369f04342a60caef4f7462005804307a410d18

runtime/debugger.cc

diff --git a/runtime/debugger.cc b/runtime/debugger.cc
index e523fbb..6e4b7a3 100644
--- a/runtime/debugger.cc
+++ b/runtime/debugger.cc
@@ -4069,13 +4069,15 @@
   if (is_constructor) {
     // If we invoked a constructor (which actually returns void), return the receiver,
     // unless we threw, in which case we return null.
-    result_tag = JDWP::JT_OBJECT;
+    DCHECK_EQ(JDWP::JT_VOID, result_tag);
     if (exceptionObjectId == 0) {
       // 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;
     }
   }