Adjust the column number where a StackOverflow error is reported.

runtime/vm/flow_graph_builder_test.cc

 // Copyright (c) 2016, 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/flow_graph_builder.h"
 #include "vm/compiler.h"
 #include "vm/dart_api_impl.h"
 #include "vm/dart_entry.h"
 #include "vm/intermediate_language.h"
 #include "vm/unit_test.h"
@@ skipping 274 matching lines @@
       "var x = 5;\n"
       "var y = 5;\n"
       "main() {\n"
       "  var z = x + y;\n"
       "  return z;\n"
       "}\n";
 
   SourcePositionTest spt(thread, kScript);
   spt.BuildGraphFor("main");
   spt.FuzzyInstructionMatchAt("DebugStepCheck", 3, 5);
-  spt.FuzzyInstructionMatchAt("CheckStackOverflow", 3, 5);
+  spt.FuzzyInstructionMatchAt("CheckStackOverflow", 3, 8);
   spt.InstanceCallAt(4, 13, Token::kADD);
   spt.FuzzyInstructionMatchAt("DebugStepCheck", 5, 3);
   spt.FuzzyInstructionMatchAt("Return", 5, 3);
 
   spt.EnsureSourcePositions();
 }
 
 TEST_CASE(SourcePosition_If) {
   const char* kScript =
       "var x = 5;\n"
       "var y = 5;\n"
       "main() {\n"
       "  if (x != 0) {\n"
       "    return x;\n"
       "  }\n"
       "  return y;\n"
       "}\n";
 
   SourcePositionTest spt(thread, kScript);
   spt.BuildGraphFor("main");
   spt.FuzzyInstructionMatchAt("DebugStepCheck", 3, 5);
-  spt.FuzzyInstructionMatchAt("CheckStackOverflow", 3, 5);
+  spt.FuzzyInstructionMatchAt("CheckStackOverflow", 3, 8);
   spt.FuzzyInstructionMatchAt("LoadStaticField", 4, 7);
   spt.InstanceCallAt(4, 9, Token::kEQ);
   spt.FuzzyInstructionMatchAt("Branch if StrictCompare", 4, 9);
   spt.FuzzyInstructionMatchAt("LoadStaticField", 5, 12);
   spt.FuzzyInstructionMatchAt("DebugStepCheck", 5, 5);
   spt.FuzzyInstructionMatchAt("Return", 5, 5);
   spt.FuzzyInstructionMatchAt("LoadStaticField", 7, 10);
   spt.FuzzyInstructionMatchAt("DebugStepCheck", 7, 3);
   spt.FuzzyInstructionMatchAt("Return", 7, 3);
 
   spt.EnsureSourcePositions();
 }
 
 TEST_CASE(SourcePosition_ForLoop) {
   const char* kScript =
       "var x = 0;\n"
       "var y = 5;\n"
       "main() {\n"
       "  for (var i = 0; i < 10; i++) {\n"
       "    x += i;\n"
       "  }\n"
       "  return x;\n"
       "}\n";
 
   SourcePositionTest spt(thread, kScript);
   spt.BuildGraphFor("main");
   spt.FuzzyInstructionMatchAt("DebugStepCheck", 3, 5);
-  spt.FuzzyInstructionMatchAt("CheckStackOverflow", 3, 5);
+  spt.FuzzyInstructionMatchAt("CheckStackOverflow", 3, 8);
   spt.FuzzyInstructionMatchAt("StoreLocal", 4, 14);
   spt.FuzzyInstructionMatchAt("LoadLocal", 4, 19);
   spt.InstanceCallAt(4, 21, Token::kLT);
   spt.FuzzyInstructionMatchAt("Branch if StrictCompare", 4, 21);
   spt.FuzzyInstructionMatchAt("LoadStaticField", 5, 5);
   spt.FuzzyInstructionMatchAt("StoreStaticField", 5, 5);
   spt.InstanceCallAt(5, 7, Token::kADD);
   spt.FuzzyInstructionMatchAt("LoadLocal", 5, 10);
   spt.FuzzyInstructionMatchAt("LoadStaticField", 7, 10);
   spt.FuzzyInstructionMatchAt("DebugStepCheck", 7, 3);
@@ skipping 12 matching lines @@
       "      return y;\n"
       "    }\n"
       "    x++;\n"
       "  }\n"
       "  return x;\n"
       "}\n";
 
   SourcePositionTest spt(thread, kScript);
   spt.BuildGraphFor("main");
   spt.FuzzyInstructionMatchAt("DebugStepCheck", 3, 5);
-  spt.FuzzyInstructionMatchAt("CheckStackOverflow", 3, 5);
+  spt.FuzzyInstructionMatchAt("CheckStackOverflow", 3, 8);
 
   spt.FuzzyInstructionMatchAt("CheckStackOverflow", 4, 3);
   spt.FuzzyInstructionMatchAt("Constant", 4, 10);
   spt.FuzzyInstructionMatchAt("LoadStaticField", 4, 10);
   spt.InstanceCallAt(4, 12, Token::kLT);
   spt.FuzzyInstructionMatchAt("Branch if StrictCompare", 4, 12);
 
   spt.FuzzyInstructionMatchAt("Constant", 5, 9);
   spt.FuzzyInstructionMatchAt("LoadStaticField", 5, 9);
   spt.InstanceCallAt(5, 11, Token::kEQ);
@@ skipping 27 matching lines @@
       "      continue;\n"
       "    }\n"
       "    break;\n"
       "  }\n"
       "  return x;\n"
       "}\n";
 
   SourcePositionTest spt(thread, kScript);
   spt.BuildGraphFor("main");
   spt.FuzzyInstructionMatchAt("DebugStepCheck", 3, 5);
-  spt.FuzzyInstructionMatchAt("CheckStackOverflow", 3, 5);
+  spt.FuzzyInstructionMatchAt("CheckStackOverflow", 3, 8);
 
   spt.FuzzyInstructionMatchAt("CheckStackOverflow", 4, 3);
   spt.FuzzyInstructionMatchAt("Constant(#Field", 4, 10);
   spt.FuzzyInstructionMatchAt("LoadStaticField", 4, 10);
   spt.FuzzyInstructionMatchAt("Constant(#10", 4, 14);
   spt.InstanceCallAt(4, 12, Token::kLT);
   spt.FuzzyInstructionMatchAt("Branch if StrictCompare", 4, 12);
 
   spt.FuzzyInstructionMatchAt("Constant(#Field", 5, 9);
   spt.FuzzyInstructionMatchAt("LoadStaticField", 5, 9);
@@ skipping 14 matching lines @@
       "var z = new List(3);\n"
       "main() {\n"
       "  z[0];\n"
       "  var y = z[0] + z[1] + z[2];\n"
       "}\n";
 
   SourcePositionTest spt(thread, kScript);
   spt.BuildGraphFor("main");
 
   spt.FuzzyInstructionMatchAt("DebugStepCheck", 3, 5);
-  spt.FuzzyInstructionMatchAt("CheckStackOverflow", 3, 5);
+  spt.FuzzyInstructionMatchAt("CheckStackOverflow", 3, 8);
   spt.StaticCallAt("get:z", 4, 3);
   spt.FuzzyInstructionMatchAt("Constant(#0)", 4, 5);
   spt.InstanceCallAt(4, 4, Token::kINDEX);
 
   spt.FuzzyInstructionMatchAt("Constant(#0)", 5, 13);
   spt.InstanceCallAt(5, 12, Token::kINDEX);
   spt.FuzzyInstructionMatchAt("Constant(#1)", 5, 20);
   spt.InstanceCallAt(5, 19, Token::kINDEX);
 
   spt.InstanceCallAt(5, 16, Token::kADD);
@@ skipping 17 matching lines @@
       "var z = new List(4);\n"
       "main() {\n"
       "  z[0];\n"
       "  z[3] = z[0] + z[1] + z[2];\n"
       "}\n";
 
   SourcePositionTest spt(thread, kScript);
   spt.BuildGraphFor("main");
 
   spt.FuzzyInstructionMatchAt("DebugStepCheck", 3, 5);
-  spt.FuzzyInstructionMatchAt("CheckStackOverflow", 3, 5);
+  spt.FuzzyInstructionMatchAt("CheckStackOverflow", 3, 8);
   spt.StaticCallAt("get:z", 4, 3);
   spt.FuzzyInstructionMatchAt("Constant(#0)", 4, 5);
   spt.InstanceCallAt(4, 4, Token::kINDEX);
 
   spt.FuzzyInstructionMatchAt("Constant(#3)", 5, 5);
 
   spt.StaticCallAt("get:z", 5, 10);
   spt.FuzzyInstructionMatchAt("Constant(#0)", 5, 12);
   spt.InstanceCallAt(5, 11, Token::kINDEX);
 
@@ skipping 26 matching lines @@
       "  z = x | y;\n"
       "  z = x ^ y;\n"
       "  z = ~z;\n"
       "  return z;\n"
       "}\n";
 
   SourcePositionTest spt(thread, kScript);
   spt.BuildGraphFor("main");
 
   spt.FuzzyInstructionMatchAt("DebugStepCheck", 3, 5);
-  spt.FuzzyInstructionMatchAt("CheckStackOverflow", 3, 5);
+  spt.FuzzyInstructionMatchAt("CheckStackOverflow", 3, 8);
 
   spt.FuzzyInstructionMatchAt("DebugStepCheck", 4, 7);
   spt.FuzzyInstructionMatchAt("Constant(#null", 4, 7);
   spt.FuzzyInstructionMatchAt("StoreLocal(z", 4, 7);
 
   spt.FuzzyInstructionMatchAt("LoadStaticField", 5, 7);
   spt.FuzzyInstructionMatchAt("LoadStaticField", 5, 11);
   spt.InstanceCallAt(5, 9, Token::kBIT_AND);
   spt.FuzzyInstructionMatchAt("StoreLocal(z", 5, 3);
 
@@ skipping 26 matching lines @@
       "  if (x != 0) {\n"
       "    return x;\n"
       "  } else {\n"
       "    return y;\n"
       "  }\n"
       "}\n";
 
   SourcePositionTest spt(thread, kScript);
   spt.BuildGraphFor("main");
   spt.FuzzyInstructionMatchAt("DebugStepCheck", 3, 5);
-  spt.FuzzyInstructionMatchAt("CheckStackOverflow", 3, 5);
+  spt.FuzzyInstructionMatchAt("CheckStackOverflow", 3, 8);
   spt.FuzzyInstructionMatchAt("LoadStaticField", 4, 7);
   spt.InstanceCallAt(4, 9, Token::kEQ);
   spt.FuzzyInstructionMatchAt("Branch if StrictCompare", 4, 9);
   spt.FuzzyInstructionMatchAt("LoadStaticField", 5, 12);
   spt.FuzzyInstructionMatchAt("DebugStepCheck", 5, 5);
   spt.FuzzyInstructionMatchAt("Return", 5, 5);
   spt.FuzzyInstructionMatchAt("LoadStaticField", 7, 12);
   spt.FuzzyInstructionMatchAt("DebugStepCheck", 7, 5);
   spt.FuzzyInstructionMatchAt("Return", 7, 5);
 
   spt.EnsureSourcePositions();
 }
 
 TEST_CASE(SourcePosition_Switch) {
   const char* kScript =
       "var x = 5;\n"
       "var y = 5;\n"
       "main() {\n"
       "  switch (x) {\n"
       "    case 1: return 3;\n"
       "    case 2: return 4;\n"
       "    default: return 5;\n"
       "  }\n"
       "}\n";
 
   SourcePositionTest spt(thread, kScript);
   spt.BuildGraphFor("main");
 
   spt.FuzzyInstructionMatchAt("DebugStepCheck", 3, 5);
-  spt.FuzzyInstructionMatchAt("CheckStackOverflow", 3, 5);
+  spt.FuzzyInstructionMatchAt("CheckStackOverflow", 3, 8);
   spt.FuzzyInstructionMatchAt("Constant(#Field", 4, 11);
   spt.FuzzyInstructionMatchAt("LoadStaticField", 4, 11);
   spt.FuzzyInstructionMatchAt("StoreLocal(:switch_expr", 4, 11);
 
   spt.FuzzyInstructionMatchAt("Constant(#1", 5, 10);
   spt.FuzzyInstructionMatchAt("LoadLocal(:switch_expr", 5, 5);  // 'c'
   spt.InstanceCallAt(5, 10, Token::kEQ);                        // '1'
 
   spt.FuzzyInstructionMatchAt("Constant(#3", 5, 20);  // '3'
   spt.FuzzyInstructionMatchAt("DebugStepCheck", 5, 13);
@@ skipping 26 matching lines @@
       "    return 77;\n"
       "  } finally {\n"
       "    return 99;\n"
       "  }\n"
       "}\n";
 
   SourcePositionTest spt(thread, kScript);
   spt.BuildGraphFor("main");
 
   spt.FuzzyInstructionMatchAt("DebugStepCheck", 3, 5);
-  spt.FuzzyInstructionMatchAt("CheckStackOverflow", 3, 5);
+  spt.FuzzyInstructionMatchAt("CheckStackOverflow", 3, 8);
 
   spt.FuzzyInstructionMatchAt("LoadLocal(:current_context", 4, 3);  // 't'
   spt.FuzzyInstructionMatchAt("StoreLocal(:saved_try_context", 4, 3);
 
   spt.FuzzyInstructionMatchAt("Constant(#A", 5, 11);  // 'A'
   spt.FuzzyInstructionMatchAt("Throw", 5, 5);         // 't'
 
   spt.FuzzyInstructionMatchAt("LoadLocal(:saved_try_context", 6, 5);  // 'c'
   spt.FuzzyInstructionMatchAt("StoreLocal(:current_context", 6, 5);   // 'c'
   spt.FuzzyInstructionMatchAt("LoadLocal(:exception_var", 6, 5);      // 'c'
@@ skipping 86 matching lines @@
   EXPECT(TokenPosition(9).ToSynthetic().IsSynthetic());
   EXPECT(!TokenPosition(-1).FromSynthetic().IsSynthetic());
   EXPECT(!TokenPosition::kNoSource.IsSynthetic());
   EXPECT(!TokenPosition::kLast.IsSynthetic());
   EXPECT(SyntheticRoundTripTest(TokenPosition(0)));
   EXPECT(SyntheticRoundTripTest(TokenPosition::kMaxSource));
   EXPECT(SyntheticRoundTripTest(TokenPosition::kMinSource));
 }
 
 }  // namespace dart