Add "function" as an argument to Dart_ActivationFrameInfo

runtime/vm/debugger_api_impl_test.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 "include/dart_debugger_api.h"
+#include "include/dart_mirrors_api.h"
 #include "platform/assert.h"
 #include "vm/dart_api_impl.h"
 #include "vm/thread.h"
 #include "vm/unit_test.h"
 
 namespace dart {
 
 static bool breakpoint_hit = false;
 static int  breakpoint_hit_counter = 0;
 static Dart_Handle script_lib = NULL;
@@ skipping 54 matching lines @@
 static char const* BreakpointInfo(Dart_StackTrace trace) {
   static char info_str[128];
   Dart_ActivationFrame frame;
   Dart_Handle res = Dart_GetActivationFrame(trace, 0, &frame);
   EXPECT_TRUE(res);
   Dart_Handle func_name;
   Dart_Handle url;
   intptr_t line_number = 0;
   intptr_t library_id = 0;
   res = Dart_ActivationFrameInfo(
-            frame, &func_name, &url, &line_number, &library_id);
+            frame, &func_name, NULL, &url, &line_number, &library_id);
   EXPECT_TRUE(res);
   OS::SNPrint(info_str, sizeof(info_str), "function %s (%s:%" Pd ")",
               ToCString(func_name), ToCString(url), line_number);
   return info_str;
 }
 
 
 static void PrintValue(Dart_Handle value, bool expand);
 
 
@@ skipping 47 matching lines @@
     OS::Print("%s", ToCString(str_value));
   } else {
     PrintObject(value, expand);
   }
 }
 
 
 static void PrintActivationFrame(Dart_ActivationFrame frame) {
   Dart_Handle func_name;
   Dart_Handle res;
-  res = Dart_ActivationFrameInfo(frame, &func_name, NULL, NULL, NULL);
+  res = Dart_ActivationFrameInfo(frame, &func_name, NULL, NULL, NULL, NULL);
   EXPECT_TRUE(res);
   EXPECT(Dart_IsString(func_name));
   const char* func_name_chars;
   Dart_StringToCString(func_name, &func_name_chars);
   OS::Print("    function %s\n", func_name_chars);
   Dart_Handle locals = Dart_GetLocalVariables(frame);
   EXPECT_VALID(locals);
   intptr_t list_length = 0;
   Dart_Handle ret = Dart_ListLength(locals, &list_length);
   EXPECT_VALID(ret);
@@ skipping 70 matching lines @@
   }
 }
 
 
 static void VerifyStackFrame(Dart_ActivationFrame frame,
                              const char* expected_name,
                              Dart_Handle expected_locals,
                              bool skip_null_expects) {
   Dart_Handle func_name;
   Dart_Handle res;
-  res = Dart_ActivationFrameInfo(frame, &func_name, NULL, NULL, NULL);
+  res = Dart_ActivationFrameInfo(frame, &func_name, NULL, NULL, NULL, NULL);
   EXPECT_TRUE(res);
   EXPECT(Dart_IsString(func_name));
   const char* func_name_chars;
   Dart_StringToCString(func_name, &func_name_chars);
   if (expected_name != NULL) {
     EXPECT_SUBSTRING(expected_name, func_name_chars);
   }
 
   if (!Dart_IsNull(expected_locals)) {
     Dart_Handle locals = Dart_GetLocalVariables(frame);
@@ skipping 35 matching lines @@
   breakpoint_hit_counter++;
   intptr_t trace_len;
   Dart_Handle res = Dart_StackTraceLength(trace, &trace_len);
   EXPECT_VALID(res);
   EXPECT_EQ(expected_trace_length, trace_len);
   for (int i = 0; i < trace_len; i++) {
     Dart_ActivationFrame frame;
     res = Dart_GetActivationFrame(trace, i, &frame);
     EXPECT_VALID(res);
     Dart_Handle func_name;
-    res = Dart_ActivationFrameInfo(frame, &func_name, NULL, NULL, NULL);
+    res = Dart_ActivationFrameInfo(frame, &func_name, NULL, NULL, NULL, NULL);
     EXPECT_VALID(res);
     EXPECT(Dart_IsString(func_name));
     const char* name_chars;
     Dart_StringToCString(func_name, &name_chars);
     EXPECT_STREQ(expected_trace[i], name_chars);
     if (verbose) OS::Print("  >> %d: %s\n", i, name_chars);
   }
 }
 
 
@@ skipping 27 matching lines @@
   const char* expected_bpts[] = {"f1", "foo", "main"};
   const intptr_t expected_bpts_length = ARRAY_SIZE(expected_bpts);
   intptr_t trace_len;
   Dart_Handle res = Dart_StackTraceLength(trace, &trace_len);
   EXPECT_VALID(res);
   EXPECT(breakpoint_hit_counter < expected_bpts_length);
   Dart_ActivationFrame frame;
   res = Dart_GetActivationFrame(trace, 0, &frame);
   EXPECT_VALID(res);
   Dart_Handle func_name;
-  res = Dart_ActivationFrameInfo(frame, &func_name, NULL, NULL, NULL);
+  Dart_Handle function;
+  res = Dart_ActivationFrameInfo(frame, &func_name, &function, NULL, NULL,
+                                 NULL);
   EXPECT_VALID(res);
   EXPECT(Dart_IsString(func_name));
+  EXPECT(Dart_IsFunction(function));
   const char* name_chars;
+  const char* name_chars_from_function_handle;
   Dart_StringToCString(func_name, &name_chars);
+  Dart_StringToCString(Dart_FunctionName(function),
+                       &name_chars_from_function_handle);
   if (breakpoint_hit_counter < expected_bpts_length) {
     EXPECT_STREQ(expected_bpts[breakpoint_hit_counter], name_chars);
   }
+  EXPECT_STREQ(name_chars, name_chars_from_function_handle);
   if (verbose) {
     OS::Print("  >> bpt nr %d: %s\n", breakpoint_hit_counter, name_chars);
   }
   breakpoint_hit = true;
   breakpoint_hit_counter++;
   Dart_SetStepOut();
 }
 
 
 TEST_CASE(Debug_StepOut) {
@@ skipping 50 matching lines @@
   };
   const intptr_t expected_bpts_length = ARRAY_SIZE(expected_bpts);
   intptr_t trace_len;
   Dart_Handle res = Dart_StackTraceLength(trace, &trace_len);
   EXPECT_VALID(res);
   EXPECT(breakpoint_hit_counter < expected_bpts_length);
   Dart_ActivationFrame frame;
   res = Dart_GetActivationFrame(trace, 0, &frame);
   EXPECT_VALID(res);
   Dart_Handle func_name;
-  res = Dart_ActivationFrameInfo(frame, &func_name, NULL, NULL, NULL);
+  res = Dart_ActivationFrameInfo(frame, &func_name, NULL, NULL, NULL, NULL);
   EXPECT_VALID(res);
   EXPECT(Dart_IsString(func_name));
   const char* name_chars;
   Dart_StringToCString(func_name, &name_chars);
   if (breakpoint_hit_counter < expected_bpts_length) {
     EXPECT_STREQ(expected_bpts[breakpoint_hit_counter], name_chars);
   }
   if (verbose) {
     OS::Print("  >> bpt nr %d: %s\n", breakpoint_hit_counter, name_chars);
   }
@@ skipping 129 matching lines @@
       "moo", "foo", "moo", "foo", "moo", "foo", "main"};
   const intptr_t expected_bpts_length = ARRAY_SIZE(expected_bpts);
   intptr_t trace_len;
   Dart_Handle res = Dart_StackTraceLength(trace, &trace_len);
   EXPECT_VALID(res);
   EXPECT(breakpoint_hit_counter < expected_bpts_length);
   Dart_ActivationFrame frame;
   res = Dart_GetActivationFrame(trace, 0, &frame);
   EXPECT_VALID(res);
   Dart_Handle func_name;
-  res = Dart_ActivationFrameInfo(frame, &func_name, NULL, NULL, NULL);
+  res = Dart_ActivationFrameInfo(frame, &func_name, NULL, NULL, NULL, NULL);
   EXPECT_VALID(res);
   EXPECT(Dart_IsString(func_name));
   const char* name_chars;
   Dart_StringToCString(func_name, &name_chars);
   if (verbose) {
     OS::Print("  >> bpt nr %d: %s\n", breakpoint_hit_counter, name_chars);
   }
   if (breakpoint_hit_counter < expected_bpts_length) {
     EXPECT_STREQ(expected_bpts[breakpoint_hit_counter], name_chars);
   }
@@ skipping 39 matching lines @@
   breakpoint_hit_counter++;
   intptr_t trace_len;
   Dart_Handle res = Dart_StackTraceLength(trace, &trace_len);
   EXPECT_VALID(res);
   EXPECT_EQ(expected_trace_length, trace_len);
   for (int i = 0; i < trace_len; i++) {
     Dart_ActivationFrame frame;
     res = Dart_GetActivationFrame(trace, i, &frame);
     EXPECT_VALID(res);
     Dart_Handle func_name;
-    res = Dart_ActivationFrameInfo(frame, &func_name, NULL, NULL, NULL);
+    res = Dart_ActivationFrameInfo(frame, &func_name, NULL, NULL, NULL, NULL);
     EXPECT_VALID(res);
     EXPECT(Dart_IsString(func_name));
     const char* name_chars;
     Dart_StringToCString(func_name, &name_chars);
     EXPECT_STREQ(expected_trace[i], name_chars);
     if (verbose) OS::Print("  >> %d: %s\n", i, name_chars);
   }
 }
 
 
@@ skipping 81 matching lines @@
   breakpoint_hit_counter++;
   intptr_t trace_len;
   Dart_Handle res = Dart_StackTraceLength(trace, &trace_len);
   EXPECT_VALID(res);
   EXPECT_EQ(expected_trace_length, trace_len);
   for (int i = 0; i < trace_len; i++) {
     Dart_ActivationFrame frame;
     res = Dart_GetActivationFrame(trace, i, &frame);
     EXPECT_VALID(res);
     Dart_Handle func_name;
-    res = Dart_ActivationFrameInfo(frame, &func_name, NULL, NULL, NULL);
+    res = Dart_ActivationFrameInfo(frame, &func_name, NULL, NULL, NULL, NULL);
     EXPECT_VALID(res);
     EXPECT(Dart_IsString(func_name));
     const char* name_chars;
     Dart_StringToCString(func_name, &name_chars);
     EXPECT_STREQ(expected_trace[i], name_chars);
     if (verbose) OS::Print("  >> %d: %s\n", i, name_chars);
   }
   // Remove the breakpoint after we've hit it twice
   if (breakpoint_hit_counter == 2) {
     if (verbose) OS::Print("uninstalling breakpoint\n");
@@ skipping 1008 matching lines @@
 
   Dart_Handle list_type = Dart_InstanceGetType(list_access_test_obj);
   Dart_Handle super_type = Dart_GetSupertype(list_type);
   EXPECT(!Dart_IsError(super_type));
   super_type = Dart_GetSupertype(super_type);
   EXPECT(!Dart_IsError(super_type));
   EXPECT(super_type == Dart_Null());
 }
 
 }  // namespace dart