diff options
author | Benjamin Coe <bencoe@google.com> | 2019-09-19 19:50:23 -0700 |
---|---|---|
committer | Myles Borins <myles.borins@gmail.com> | 2019-10-07 03:20:14 -0400 |
commit | 019b23b3e4c3decd47246f7306b690c115e9b3e9 (patch) | |
tree | 8737022449abcdc65fe108d974a1be17f7ff9286 /deps/v8 | |
parent | 174723354ef6ad20e423c44b6d8af63ef7a0040c (diff) | |
download | android-node-v8-019b23b3e4c3decd47246f7306b690c115e9b3e9.tar.gz android-node-v8-019b23b3e4c3decd47246f7306b690c115e9b3e9.tar.bz2 android-node-v8-019b23b3e4c3decd47246f7306b690c115e9b3e9.zip |
deps: V8: cherry-pick deac757
Original commit message:
[debugger] Fix code coverage for break/return inside switch-case
Case statements have a list of statements associated with them, but are
not blocks, and were hence not fixed-up correctly for code coverage.
This CL also applies the fix-up to the "body" of case statements,
in this way removing ranges reported as uncovered between the final
break/return in a case and the next case (or end of function).
Drive-by: Add optional pretty printing to code coverage test results.
Change-Id: I5f4002d4e17b7253ed516d99f7c389ab2264be10
Bug: v8:9705
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/1798426
Reviewed-by: Toon Verwaest <verwaest@chromium.org>
Reviewed-by: Jakob Gruber <jgruber@chromium.org>
Commit-Queue: Sigurd Schneider <sigurds@chromium.org>
Cr-Commit-Position: refs/heads/master@{#63719}
Refs: https://github.com/v8/v8/commit/deac757bc76d207845375340bcea090c774ad9d0
PR-URL: https://github.com/nodejs/node/pull/29626
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Shelley Vohr <codebytere@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Diffstat (limited to 'deps/v8')
-rw-r--r-- | deps/v8/src/ast/source-range-ast-visitor.cc | 8 | ||||
-rw-r--r-- | deps/v8/src/ast/source-range-ast-visitor.h | 1 | ||||
-rw-r--r-- | deps/v8/test/mjsunit/code-coverage-block.js | 53 | ||||
-rw-r--r-- | deps/v8/test/mjsunit/code-coverage-utils.js | 29 |
4 files changed, 80 insertions, 11 deletions
diff --git a/deps/v8/src/ast/source-range-ast-visitor.cc b/deps/v8/src/ast/source-range-ast-visitor.cc index d171e30587..2fcf151999 100644 --- a/deps/v8/src/ast/source-range-ast-visitor.cc +++ b/deps/v8/src/ast/source-range-ast-visitor.cc @@ -25,6 +25,14 @@ void SourceRangeAstVisitor::VisitBlock(Block* stmt) { } } +void SourceRangeAstVisitor::VisitSwitchStatement(SwitchStatement* stmt) { + AstTraversalVisitor::VisitSwitchStatement(stmt); + ZonePtrList<CaseClause>* clauses = stmt->cases(); + for (CaseClause* clause : *clauses) { + MaybeRemoveLastContinuationRange(clause->statements()); + } +} + void SourceRangeAstVisitor::VisitFunctionLiteral(FunctionLiteral* expr) { AstTraversalVisitor::VisitFunctionLiteral(expr); ZonePtrList<Statement>* stmts = expr->body(); diff --git a/deps/v8/src/ast/source-range-ast-visitor.h b/deps/v8/src/ast/source-range-ast-visitor.h index 4ea36a947f..4ba5feb2d2 100644 --- a/deps/v8/src/ast/source-range-ast-visitor.h +++ b/deps/v8/src/ast/source-range-ast-visitor.h @@ -34,6 +34,7 @@ class SourceRangeAstVisitor final friend class AstTraversalVisitor<SourceRangeAstVisitor>; void VisitBlock(Block* stmt); + void VisitSwitchStatement(SwitchStatement* stmt); void VisitFunctionLiteral(FunctionLiteral* expr); bool VisitNode(AstNode* node); diff --git a/deps/v8/test/mjsunit/code-coverage-block.js b/deps/v8/test/mjsunit/code-coverage-block.js index c441342cdf..a7bad5bf11 100644 --- a/deps/v8/test/mjsunit/code-coverage-block.js +++ b/deps/v8/test/mjsunit/code-coverage-block.js @@ -434,8 +434,8 @@ TestCoverage( `, [{"start":0,"end":399,"count":1}, {"start":1,"end":351,"count":1}, - {"start":154,"end":204,"count":0}, - {"start":226,"end":350,"count":0}] + {"start":154,"end":176,"count":0}, + {"start":254,"end":276,"count":0}] ); TestCoverage( @@ -464,8 +464,8 @@ TestCoverage( `, [{"start":0,"end":999,"count":1}, {"start":1,"end":951,"count":1}, - {"start":152,"end":202,"count":0}, - {"start":285,"end":353,"count":0}] + {"start":152,"end":168,"count":0}, + {"start":287,"end":310,"count":0}] ); TestCoverage( @@ -1052,4 +1052,49 @@ try { // 0500 {"start":69,"end":153,"count":1}] ); +TestCoverage( +"https://crbug.com/v8/9705", +` +function f(x) { // 0000 + switch (x) { // 0050 + case 40: nop(); // 0100 + case 41: nop(); return 1; // 0150 + case 42: nop(); break; // 0200 + } // 0250 + return 3; // 0300 +}; // 0350 +f(40); // 0400 +f(41); // 0450 +f(42); // 0500 +f(43); // 0550 +`, +[{"start":0,"end":599,"count":1}, + {"start":0,"end":351,"count":4}, + {"start":104,"end":119,"count":1}, + {"start":154,"end":179,"count":2}, + {"start":204,"end":226,"count":1}, + {"start":253,"end":350,"count":2}] +); + +TestCoverage( +"https://crbug.com/v8/9705", +` +function f(x) { // 0000 + switch (x) { // 0050 + case 40: nop(); // 0100 + case 41: nop(); return 1; // 0150 + case 42: nop(); break; // 0200 + } // 0250 + return 3; // 0300 +}; // 0350 +f(42); // 0400 +f(43); // 0450 +`, +[{"start":0,"end":499,"count":1}, + {"start":0,"end":351,"count":2}, + {"start":104,"end":119,"count":0}, + {"start":154,"end":179,"count":0}, + {"start":204,"end":226,"count":1}] +); + %DebugToggleBlockCoverage(false); diff --git a/deps/v8/test/mjsunit/code-coverage-utils.js b/deps/v8/test/mjsunit/code-coverage-utils.js index 5783390222..4164f5a314 100644 --- a/deps/v8/test/mjsunit/code-coverage-utils.js +++ b/deps/v8/test/mjsunit/code-coverage-utils.js @@ -18,25 +18,40 @@ let gen; return undefined; }; - function TestCoverageInternal(name, source, expectation, collect_garbage) { + function TestCoverageInternal( + name, source, expectation, collect_garbage, prettyPrintResults) { source = source.trim(); eval(source); if (collect_garbage) %CollectGarbage("collect dead objects"); var covfefe = GetCoverage(source); var stringified_result = JSON.stringify(covfefe); var stringified_expectation = JSON.stringify(expectation); - if (stringified_result != stringified_expectation) { - print(stringified_result.replace(/[}],[{]/g, "},\n {")); + const mismatch = stringified_result != stringified_expectation; + if (mismatch) { + console.log(stringified_result.replace(/[}],[{]/g, "},\n {")); + } + if (prettyPrintResults) { + console.log("=== Coverage Expectation ===") + for (const {start,end,count} of expectation) { + console.log(`Range [${start}, ${end}) (count: ${count})`); + console.log(source.substring(start, end)); + } + console.log("=== Coverage Results ===") + for (const {start,end,count} of covfefe) { + console.log(`Range [${start}, ${end}) (count: ${count})`); + console.log(source.substring(start, end)); + } + console.log("========================") } assertEquals(stringified_expectation, stringified_result, name + " failed"); }; - TestCoverage = function(name, source, expectation) { - TestCoverageInternal(name, source, expectation, true); + TestCoverage = function(name, source, expectation, prettyPrintResults) { + TestCoverageInternal(name, source, expectation, true, prettyPrintResults); }; - TestCoverageNoGC = function(name, source, expectation) { - TestCoverageInternal(name, source, expectation, false); + TestCoverageNoGC = function(name, source, expectation, prettyPrintResults) { + TestCoverageInternal(name, source, expectation, false, prettyPrintResults); }; nop = function() {}; |