Revert "[coverage] change block range to avoid ambiguity."

schuay · Commit Bot · commit 47d34a317e47 · 2018-10-10T10:11:57.000Z
This reverts commit 471fef0. Reason for revert: A more general fix incoming at https://crrev.com/c/1273095. Original change's description: > [coverage] change block range to avoid ambiguity. > > By moving the block range end to left of closing bracket, > we can avoid ambiguity where an open-ended singleton range > could be both interpreted as inside the parent range, or > next to it. > > R=​verwaest@chromium.org > > Bug: v8:8237 > Change-Id: Ibc9412b31efe900b6d8bff0d8fa8c52ddfbf460a > Reviewed-on: https://chromium-review.googlesource.com/1254127 > Reviewed-by: Georg Neis <neis@chromium.org> > Commit-Queue: Yang Guo <yangguo@chromium.org> > Cr-Commit-Position: refs/heads/master@{#56347} TBR=yangguo@chromium.org,neis@chromium.org,verwaest@chromium.org # Not skipping CQ checks because original CL landed > 1 day ago. Bug: v8:8237 Change-Id: I39310cf3c2f06a0d98ff314740aaeefbfffc0834 Reviewed-on: https://chromium-review.googlesource.com/c/1273096 Reviewed-by: Jakob Gruber <jgruber@chromium.org> Reviewed-by: Toon Verwaest <verwaest@chromium.org> Reviewed-by: Yang Guo <yangguo@chromium.org> Commit-Queue: Jakob Gruber <jgruber@chromium.org> Cr-Commit-Position: refs/heads/master@{#56513}
diff --git a/src/debug/debug-coverage.cc b/src/debug/debug-coverage.cc
@@ -81,11 +81,6 @@ std::vector<CoverageBlock> GetSortedBlockData(SharedFunctionInfo* shared) {
   std::vector<CoverageBlock> result;
   if (coverage_info->SlotCount() == 0) return result;
 
-  if (FLAG_trace_block_coverage) {
-    PrintF("Collecting coverage data\n");
-    coverage_info->Print(shared->DebugName()->ToCString());
-  }
-
   for (int i = 0; i < coverage_info->SlotCount(); i++) {
     const int start_pos = coverage_info->StartSourcePosition(i);
     const int until_pos = coverage_info->EndSourcePosition(i);
diff --git a/src/objects/debug-objects.cc b/src/objects/debug-objects.cc
@@ -375,7 +375,7 @@ void CoverageInfo::Print(std::unique_ptr<char[]> function_name) {
 
   for (int i = 0; i < SlotCount(); i++) {
     os << "{" << StartSourcePosition(i) << "," << EndSourcePosition(i) << "}"
-       << ": " << BlockCount(i) << std::endl;
+       << std::endl;
   }
 }
 
diff --git a/src/parsing/parser-base.h b/src/parsing/parser-base.h
@@ -5097,7 +5097,6 @@ typename ParserBase<Impl>::BlockT ParserBase<Impl>::ParseBlock(
   Expect(Token::LBRACE, CHECK_OK_CUSTOM(NullStatement));
   {
     BlockState block_state(zone(), &scope_);
-    // Scope starts before opening brace.
     scope()->set_start_position(scanner()->location().beg_pos);
     typename Types::Target target(this, body);
 
@@ -5109,10 +5108,9 @@ typename ParserBase<Impl>::BlockT ParserBase<Impl>::ParseBlock(
     }
 
     Expect(Token::RBRACE, CHECK_OK_CUSTOM(NullStatement));
-    // Scope ends after closing brace.
-    scope()->set_end_position(scanner()->location().end_pos);
-    // Coverage range uses position before closing brace.
-    impl()->RecordBlockSourceRange(body, scanner()->location().beg_pos);
+    int end_pos = end_position();
+    scope()->set_end_position(end_pos);
+    impl()->RecordBlockSourceRange(body, end_pos);
     body->set_scope(scope()->FinalizeBlockScope());
   }
   return body;
diff --git a/test/mjsunit/code-coverage-block.js b/test/mjsunit/code-coverage-block.js
@@ -471,7 +471,7 @@ TestCoverage(
  {"start":472,"end":503,"count":0},
  {"start":626,"end":653,"count":0},
  {"start":768,"end":803,"count":0},
- {"start":867,"end":868,"count":0}]
+ {"start":867,"end":869,"count":0}]
 );
 
 TestCoverage(
@@ -847,7 +847,7 @@ Util.escape("foo.bar");                   // 0400
 [{"start":0,"end":449,"count":1},
  {"start":64,"end":351,"count":1},
  {"start":112,"end":203,"count":0},
- {"start":268,"end":350,"count":0}]
+ {"start":303,"end":350,"count":0}]
 );
 
 %DebugToggleBlockCoverage(false);
diff --git a/test/mjsunit/regress/regress-8237.js b/test/mjsunit/regress/regress-8237.js

Original file line number	Diff line number	Diff line change
`@@ -375,7 +375,7 @@ void CoverageInfo::Print(std::unique_ptr<char[]> function_name) {`
`375`	`375`
`376`	`376`	`for (int i = 0; i < SlotCount(); i++) {`
`377`	`377`	`os << "{" << StartSourcePosition(i) << "," << EndSourcePosition(i) << "}"`
`378`		`- << ": " << BlockCount(i) << std::endl;`
	`378`	`+ << std::endl;`
`379`	`379`	`}`
`380`	`380`	`}`
`381`	`381`
Original file line number	Diff line number	Diff line change
`@@ -5097,7 +5097,6 @@ typename ParserBase<Impl>::BlockT ParserBase<Impl>::ParseBlock(`
`5097`	`5097`	`Expect(Token::LBRACE, CHECK_OK_CUSTOM(NullStatement));`
`5098`	`5098`	`{`
`5099`	`5099`	`BlockState block_state(zone(), &scope_);`
`5100`		`- // Scope starts before opening brace.`
`5101`	`5100`	`scope()->set_start_position(scanner()->location().beg_pos);`
`5102`	`5101`	`typename Types::Target target(this, body);`
`5103`	`5102`
`@@ -5109,10 +5108,9 @@ typename ParserBase<Impl>::BlockT ParserBase<Impl>::ParseBlock(`
`5109`	`5108`	`}`
`5110`	`5109`
`5111`	`5110`	`Expect(Token::RBRACE, CHECK_OK_CUSTOM(NullStatement));`
`5112`		`- // Scope ends after closing brace.`
`5113`		`- scope()->set_end_position(scanner()->location().end_pos);`
`5114`		`- // Coverage range uses position before closing brace.`
`5115`		`- impl()->RecordBlockSourceRange(body, scanner()->location().beg_pos);`
	`5111`	`+ int end_pos = end_position();`
	`5112`	`+ scope()->set_end_position(end_pos);`
	`5113`	`+ impl()->RecordBlockSourceRange(body, end_pos);`
`5116`	`5114`	`body->set_scope(scope()->FinalizeBlockScope());`
`5117`	`5115`	`}`
`5118`	`5116`	`return body;`