[parsing] better disambiguate with scopes

verwaest · V8 LUCI CQ · commit 479fdc15dfcb · 2024-07-15T09:07:04.000Z
drive-by: enable reuse-scope-infos behind --fuzzing Bug: 352402518 Change-Id: I993a81421c399c353927771cf371cc265941a1e4 Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/5707148 Reviewed-by: Leszek Swirski <leszeks@chromium.org> Auto-Submit: Toon Verwaest <verwaest@chromium.org> Commit-Queue: Toon Verwaest <verwaest@chromium.org> Cr-Commit-Position: refs/heads/main@{#95015}
diff --git a/src/flags/flag-definitions.h b/src/flags/flag-definitions.h
@@ -995,6 +995,8 @@ DEFINE_BOOL(trace_generalization, false, "trace map generalization")
 DEFINE_BOOL(reuse_scope_infos, false,
             "reuse scope infos from previous compiles")
 
+DEFINE_IMPLICATION(fuzzing, reuse_scope_infos)
+
 // Flags for Sparkplug
 #undef FLAG
 #if V8_ENABLE_SPARKPLUG
diff --git a/src/parsing/parser-base.h b/src/parsing/parser-base.h
@@ -6097,7 +6097,7 @@ typename ParserBase<Impl>::StatementT ParserBase<Impl>::ParseWithStatement(
   StatementT body = impl()->NullStatement();
   {
     BlockState block_state(&scope_, with_scope);
-    with_scope->set_start_position(end_position());
+    with_scope->set_start_position(position());
     body = ParseStatement(labels, nullptr);
     with_scope->set_end_position(end_position());
   }
diff --git a/test/cctest/test-debug.cc b/test/cctest/test-debug.cc
@@ -3150,7 +3150,7 @@ class DebugScopingListener : public v8::debug::DebugDelegate {
 
     auto scopes = stack_traces->GetScopeIterator();
     CHECK_EQ(v8::debug::ScopeIterator::ScopeTypeWith, scopes->GetType());
-    CHECK_EQ(20, scopes->GetStartLocation().GetColumnNumber());
+    CHECK_EQ(19, scopes->GetStartLocation().GetColumnNumber());
     CHECK_EQ(31, scopes->GetEndLocation().GetColumnNumber());
 
     scopes->Advance();
diff --git a/test/mjsunit/regress-352402518.js b/test/mjsunit/regress-352402518.js
@@ -0,0 +1,7 @@
+// Copyright 2024 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Flags: --reuse-scope-infos
+
+with({}){function h(){}}
diff --git a/test/unittests/parser/parsing-unittest.cc b/test/unittests/parser/parsing-unittest.cc
@@ -1507,24 +1507,24 @@ TEST_F(ParsingTest, ScopePositions) {
   };
 
   const SourceData source_data[] = {
-      {"  with ({})", "{ block; }", " more;", i::WITH_SCOPE,
+      {"  with ({}", "){ block; }", " more;", i::WITH_SCOPE,
        i::LanguageMode::kSloppy},
-      {"  with ({})", "{ block; }", "; more;", i::WITH_SCOPE,
+      {"  with ({}", "){ block; }", "; more;", i::WITH_SCOPE,
        i::LanguageMode::kSloppy},
-      {"  with ({})",
-       "{\n"
+      {"  with ({}",
+       "){\n"
        "    block;\n"
        "  }",
        "\n"
        "  more;",
        i::WITH_SCOPE, i::LanguageMode::kSloppy},
-      {"  with ({})", "statement;", " more;", i::WITH_SCOPE,
+      {"  with ({}", ")statement;", " more;", i::WITH_SCOPE,
        i::LanguageMode::kSloppy},
-      {"  with ({})", "statement",
+      {"  with ({}", ")statement",
        "\n"
        "  more;",
        i::WITH_SCOPE, i::LanguageMode::kSloppy},
-      {"  with ({})", "statement;",
+      {"  with ({}", ")statement;",
        "\n"
        "  more;",
        i::WITH_SCOPE, i::LanguageMode::kSloppy},

Original file line number	Diff line number	Diff line change
`@@ -6097,7 +6097,7 @@ typename ParserBase<Impl>::StatementT ParserBase<Impl>::ParseWithStatement(`
`6097`	`6097`	`StatementT body = impl()->NullStatement();`
`6098`	`6098`	`{`
`6099`	`6099`	`BlockState block_state(&scope_, with_scope);`
`6100`		`- with_scope->set_start_position(end_position());`
	`6100`	`+ with_scope->set_start_position(position());`
`6101`	`6101`	`body = ParseStatement(labels, nullptr);`
`6102`	`6102`	`with_scope->set_end_position(end_position());`
`6103`	`6103`	`}`