Commit deac757b authored by Sigurd Schneider's avatar Sigurd Schneider Committed by Commit Bot

[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/+/1798426Reviewed-by: 's avatarToon Verwaest <verwaest@chromium.org>
Reviewed-by: 's avatarJakob Gruber <jgruber@chromium.org>
Commit-Queue: Sigurd Schneider <sigurds@chromium.org>
Cr-Commit-Position: refs/heads/master@{#63719}
parent 8e26b122
...@@ -25,6 +25,14 @@ void SourceRangeAstVisitor::VisitBlock(Block* stmt) { ...@@ -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) { void SourceRangeAstVisitor::VisitFunctionLiteral(FunctionLiteral* expr) {
AstTraversalVisitor::VisitFunctionLiteral(expr); AstTraversalVisitor::VisitFunctionLiteral(expr);
ZonePtrList<Statement>* stmts = expr->body(); ZonePtrList<Statement>* stmts = expr->body();
......
...@@ -34,6 +34,7 @@ class SourceRangeAstVisitor final ...@@ -34,6 +34,7 @@ class SourceRangeAstVisitor final
friend class AstTraversalVisitor<SourceRangeAstVisitor>; friend class AstTraversalVisitor<SourceRangeAstVisitor>;
void VisitBlock(Block* stmt); void VisitBlock(Block* stmt);
void VisitSwitchStatement(SwitchStatement* stmt);
void VisitFunctionLiteral(FunctionLiteral* expr); void VisitFunctionLiteral(FunctionLiteral* expr);
bool VisitNode(AstNode* node); bool VisitNode(AstNode* node);
void VisitTryCatchStatement(TryCatchStatement* stmt); void VisitTryCatchStatement(TryCatchStatement* stmt);
......
...@@ -419,8 +419,8 @@ TestCoverage( ...@@ -419,8 +419,8 @@ TestCoverage(
`, `,
[{"start":0,"end":399,"count":1}, [{"start":0,"end":399,"count":1},
{"start":1,"end":351,"count":1}, {"start":1,"end":351,"count":1},
{"start":154,"end":204,"count":0}, {"start":154,"end":176,"count":0},
{"start":226,"end":350,"count":0}] {"start":254,"end":276,"count":0}]
); );
TestCoverage( TestCoverage(
...@@ -449,8 +449,8 @@ TestCoverage( ...@@ -449,8 +449,8 @@ TestCoverage(
`, `,
[{"start":0,"end":999,"count":1}, [{"start":0,"end":999,"count":1},
{"start":1,"end":951,"count":1}, {"start":1,"end":951,"count":1},
{"start":152,"end":202,"count":0}, {"start":152,"end":168,"count":0},
{"start":285,"end":353,"count":0}] {"start":287,"end":310,"count":0}]
); );
TestCoverage( TestCoverage(
...@@ -1023,4 +1023,49 @@ try { // 0500 ...@@ -1023,4 +1023,49 @@ try { // 0500
{"start":69,"end":153,"count":1}] {"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); %DebugToggleBlockCoverage(false);
...@@ -18,25 +18,40 @@ let gen; ...@@ -18,25 +18,40 @@ let gen;
return undefined; return undefined;
}; };
function TestCoverageInternal(name, source, expectation, collect_garbage) { function TestCoverageInternal(
name, source, expectation, collect_garbage, prettyPrintResults) {
source = source.trim(); source = source.trim();
eval(source); eval(source);
if (collect_garbage) %CollectGarbage("collect dead objects"); if (collect_garbage) %CollectGarbage("collect dead objects");
var covfefe = GetCoverage(source); var covfefe = GetCoverage(source);
var stringified_result = JSON.stringify(covfefe); var stringified_result = JSON.stringify(covfefe);
var stringified_expectation = JSON.stringify(expectation); var stringified_expectation = JSON.stringify(expectation);
if (stringified_result != stringified_expectation) { const mismatch = stringified_result != stringified_expectation;
print(stringified_result.replace(/[}],[{]/g, "},\n {")); 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"); assertEquals(stringified_expectation, stringified_result, name + " failed");
}; };
TestCoverage = function(name, source, expectation) { TestCoverage = function(name, source, expectation, prettyPrintResults) {
TestCoverageInternal(name, source, expectation, true); TestCoverageInternal(name, source, expectation, true, prettyPrintResults);
}; };
TestCoverageNoGC = function(name, source, expectation) { TestCoverageNoGC = function(name, source, expectation, prettyPrintResults) {
TestCoverageInternal(name, source, expectation, false); TestCoverageInternal(name, source, expectation, false, prettyPrintResults);
}; };
nop = function() {}; nop = function() {};
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment