Add class id to debugger stack trace

runtime/bin/dbg_message.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "bin/dbg_connection.h"
 #include "bin/dbg_message.h"
 #include "bin/dartutils.h"
 #include "bin/thread.h"
 #include "bin/utils.h"
 
@@ skipping 455 matching lines @@
 static void FormatCallFrames(dart::TextBuffer* msg, Dart_StackTrace trace) {
   intptr_t trace_len = 0;
   Dart_Handle res = Dart_StackTraceLength(trace, &trace_len);
   ASSERT_NOT_ERROR(res);
   msg->Printf("\"callFrames\" : [ ");
   for (int i = 0; i < trace_len; i++) {
     Dart_ActivationFrame frame;
     res = Dart_GetActivationFrame(trace, i, &frame);
     ASSERT_NOT_ERROR(res);
     Dart_Handle func_name;
+    Dart_Handle func;
     Dart_CodeLocation location;
-    res = Dart_ActivationFrameGetLocation(frame, &func_name, NULL, &location);
+    res = Dart_ActivationFrameGetLocation(frame, &func_name, &func, &location);
     ASSERT_NOT_ERROR(res);
     ASSERT(Dart_IsString(func_name));
     msg->Printf("%s{\"functionName\":", (i > 0) ? "," : "");
     FormatEncodedString(msg, func_name);
     if (!Dart_IsNull(location.script_url)) {
       ASSERT(Dart_IsString(location.script_url));
       msg->Printf(",\"location\": { \"url\":");
       FormatEncodedString(msg, location.script_url);
       msg->Printf(",\"libraryId\":%d,", location.library_id);
       msg->Printf("\"tokenOffset\":%d}", location.token_pos);
     }
+    ASSERT_NOT_ERROR(func);
+    Dart_Handle origin = Dart_GetFunctionOrigin(func);
+    ASSERT_NOT_ERROR(origin);
+    if (Dart_IsInteger(origin)) {
+      int64_t class_id = GetIntValue(origin);
+      msg->Printf(",\"classId\":%" Pd64 "", class_id);
+    }
     Dart_Handle locals = Dart_GetLocalVariables(frame);
     ASSERT_NOT_ERROR(locals);
     msg->Printf(",\"locals\":");
     FormatNamedValueList(msg, locals);
     msg->Printf("}");
   }
   msg->Printf("]");
 }
 
 
@@ skipping 880 matching lines @@
     } else {
       ASSERT(kind == kShutdown);
       RemoveIsolateMsgQueue(isolate_id);
     }
   }
   Dart_ExitScope();
 }
 
 }  // namespace bin
 }  // namespace dart