Adjust the column number where a StackOverflow error is reported.

runtime/vm/dart_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 "vm/dart_api_impl.h"
 #include "bin/builtin.h"
 #include "include/dart_api.h"
 #include "include/dart_mirrors_api.h"
 #include "include/dart_native_api.h"
 #include "include/dart_tools_api.h"
@@ skipping 195 matching lines @@
   EXPECT_EQ(2, line_number);
   EXPECT_EQ(15, column_number);
 
   // Out-of-bounds frames.
   result = Dart_GetActivationFrame(stacktrace, frame_count, &frame);
   EXPECT(Dart_IsError(result));
   result = Dart_GetActivationFrame(stacktrace, -1, &frame);
   EXPECT(Dart_IsError(result));
 }
 
-TEST_CASE(DartAPI_StackOverflowStackTraceInfo) {
-  const char* kScriptChars =
-      "class C {\n"
-      "  static foo() => foo();\n"
-      "}\n"
-      "testMain() => C.foo();\n";
-
-  Dart_Handle lib = TestCase::LoadTestScript(kScriptChars, NULL);
-  Dart_Handle error = Dart_Invoke(lib, NewString("testMain"), 0, NULL);
+void VerifyStackOverflowStackTraceInfo(const char* script,
+                                       const char* top_frame_func_name,
+                                       const char* entry_func_name,
+                                       int expected_line_number,
+                                       int expected_column_number) {
+  Dart_Handle lib = TestCase::LoadTestScript(script, NULL);
+  Dart_Handle error = Dart_Invoke(lib, NewString(entry_func_name), 0, NULL);
 
   EXPECT(Dart_IsError(error));
 
   Dart_StackTrace stacktrace;
   Dart_Handle result = Dart_GetStackTraceFromError(error, &stacktrace);
   EXPECT_VALID(result);
 
   intptr_t frame_count = 0;
   result = Dart_StackTraceLength(stacktrace, &frame_count);
   EXPECT_VALID(result);
   EXPECT_EQ(StackTrace::kPreallocatedStackdepth - 1, frame_count);
 
   Dart_Handle function_name;
   Dart_Handle script_url;
   intptr_t line_number = 0;
   intptr_t column_number = 0;
   const char* cstr = "";
 
   // Top frame at recursive call.
   Dart_ActivationFrame frame;
   result = Dart_GetActivationFrame(stacktrace, 0, &frame);
   EXPECT_VALID(result);
   result = Dart_ActivationFrameInfo(frame, &function_name, &script_url,
                                     &line_number, &column_number);
   EXPECT_VALID(result);
   Dart_StringToCString(function_name, &cstr);
-  EXPECT_STREQ("C.foo", cstr);
+  EXPECT_STREQ(top_frame_func_name, cstr);
   Dart_StringToCString(script_url, &cstr);
   EXPECT_STREQ("test-lib", cstr);
-  EXPECT_EQ(2, line_number);
-  EXPECT_EQ(13, column_number);
+  EXPECT_EQ(expected_line_number, line_number);
+  EXPECT_EQ(expected_column_number, column_number);
 
   // Out-of-bounds frames.
   result = Dart_GetActivationFrame(stacktrace, frame_count, &frame);
   EXPECT(Dart_IsError(result));
   result = Dart_GetActivationFrame(stacktrace, -1, &frame);
   EXPECT(Dart_IsError(result));
 }
 
+TEST_CASE(DartAPI_StackOverflowStackTraceInfoBraceFunction1) {
+  VerifyStackOverflowStackTraceInfo(
+      "class C {\n"
+      "  static foo(int i) { foo(i); }\n"
+      "}\n"
+      "testMain() => C.foo(10);\n",
+      "C.foo", "testMain", 2, 21);
+}
+
+TEST_CASE(DartAPI_StackOverflowStackTraceInfoBraceFunction2) {
+  VerifyStackOverflowStackTraceInfo(
+      "class C {\n"
+      "  static foo(int i, int j) {\n"
+      "    foo(i, j);\n"
+      "  }\n"
+      "}\n"
+      "testMain() => C.foo(10, 11);\n",
+      "C.foo", "testMain", 2, 28);
+}
+
+TEST_CASE(DartAPI_StackOverflowStackTraceInfoArrowFunction) {
+  VerifyStackOverflowStackTraceInfo(
+      "class C {\n"
+      "  static foo(int i) => foo(i);\n"
+      "}\n"
+      "testMain() => C.foo(10);\n",
+      "C.foo", "testMain", 2, 21);
+}
+
 TEST_CASE(DartAPI_OutOfMemoryStackTraceInfo) {
   const char* kScriptChars =
       "var number_of_ints = 134000000;\n"
       "testMain() {\n"
       "  new List<int>(number_of_ints)\n"
       "}\n";
 
   Dart_Handle lib = TestCase::LoadTestScript(kScriptChars, NULL);
   Dart_Handle error = Dart_Invoke(lib, NewString("testMain"), 0, NULL);
 
@@ skipping 9412 matching lines @@
   EXPECT_VALID(result);
   result = Dart_FinalizeLoading(false);
   EXPECT_VALID(result);
   result = Dart_Invoke(lib, NewString("foozoo"), 0, NULL);
   EXPECT(Dart_IsError(result));
 }
 
 #endif  // !PRODUCT
 
 }  // namespace dart