Skip to content

V
V8
Commit b6bbfaec authored by jgruber's avatar jgruber Committed by Commit Bot
Browse files
Options

[coverage] Add support for jumps (Break,Continue,Return) 

Drive-by-fixes: Singleton ranges past EOF, disable optimization
for block count mode.

Bug: v8:6000
Change-Id: I718891f8821285ce3d7d8360faaa91a43de5b93d
Reviewed-on: https://chromium-review.googlesource.com/541300Reviewed-by: 's avatarRoss McIlroy <rmcilroy@chromium.org>
Reviewed-by: 's avatarMarja Hölttä <marja@chromium.org>
Commit-Queue: Jakob Gruber <jgruber@chromium.org>
Cr-Commit-Position: refs/heads/master@{#46168}
parent 8d921ca7
Hide whitespace changes
Inline Side-by-side
Showing with 158 additions and 33 deletions
src/ast/ast.h
View file @ b6bbfaec
......@@ -775,8 +775,13 @@ class JumpStatement : public Statement {
public:
bool IsJump() const { return true; }
int32_t continuation_pos() const { return continuation_pos_; }
protected:
JumpStatement(int pos, NodeType type) : Statement(pos, type) {}
JumpStatement(int pos, NodeType type, int32_t continuation_pos)
: Statement(pos, type), continuation_pos_(continuation_pos) {}
int32_t continuation_pos_;
};
......@@ -787,8 +792,9 @@ class ContinueStatement final : public JumpStatement {
private:
friend class AstNodeFactory;
ContinueStatement(IterationStatement* target, int pos)
: JumpStatement(pos, kContinueStatement), target_(target) {}
ContinueStatement(IterationStatement* target, int pos, int continuation_pos)
: JumpStatement(pos, kContinueStatement, continuation_pos),
target_(target) {}
IterationStatement* target_;
};
......@@ -801,8 +807,9 @@ class BreakStatement final : public JumpStatement {
private:
friend class AstNodeFactory;
BreakStatement(BreakableStatement* target, int pos)
: JumpStatement(pos, kBreakStatement), target_(target) {}
BreakStatement(BreakableStatement* target, int pos, int continuation_pos)
: JumpStatement(pos, kBreakStatement, continuation_pos),
target_(target) {}
BreakableStatement* target_;
};
......@@ -820,8 +827,10 @@ class ReturnStatement final : public JumpStatement {
private:
friend class AstNodeFactory;
ReturnStatement(Expression* expression, Type type, int pos)
: JumpStatement(pos, kReturnStatement), expression_(expression) {
ReturnStatement(Expression* expression, Type type, int pos,
int continuation_pos)
: JumpStatement(pos, kReturnStatement, continuation_pos),
expression_(expression) {
bit_field_ |= TypeField::encode(type);
}
......@@ -3110,22 +3119,29 @@ class AstNodeFactory final BASE_EMBEDDED {
return new (zone_) ExpressionStatement(expression, pos);
}
ContinueStatement* NewContinueStatement(IterationStatement* target, int pos) {
return new (zone_) ContinueStatement(target, pos);
ContinueStatement* NewContinueStatement(
IterationStatement* target, int pos,
int continuation_pos = kNoSourcePosition) {
return new (zone_) ContinueStatement(target, pos, continuation_pos);
}
BreakStatement* NewBreakStatement(BreakableStatement* target, int pos) {
return new (zone_) BreakStatement(target, pos);
BreakStatement* NewBreakStatement(BreakableStatement* target, int pos,
int continuation_pos = kNoSourcePosition) {
return new (zone_) BreakStatement(target, pos, continuation_pos);
}
ReturnStatement* NewReturnStatement(Expression* expression, int pos) {
return new (zone_)
ReturnStatement(expression, ReturnStatement::kNormal, pos);
ReturnStatement* NewReturnStatement(
Expression* expression, int pos,
int continuation_pos = kNoSourcePosition) {
return new (zone_) ReturnStatement(expression, ReturnStatement::kNormal,
pos, continuation_pos);
}
ReturnStatement* NewAsyncReturnStatement(Expression* expression, int pos) {
return new (zone_)
ReturnStatement(expression, ReturnStatement::kAsyncReturn, pos);
ReturnStatement* NewAsyncReturnStatement(
Expression* expression, int pos,
int continuation_pos = kNoSourcePosition) {
return new (zone_) ReturnStatement(
expression, ReturnStatement::kAsyncReturn, pos, continuation_pos);
}
WithStatement* NewWithStatement(Scope* scope,
......
src/debug/debug-coverage.cc
View file @ b6bbfaec
......@@ -155,6 +155,13 @@ void RewritePositionSingletonsToRanges(CoverageFunction* function) {
for (int i = 0; i < blocks_count; i++) {
CoverageBlock& block = function->blocks[i];
if (block.start >= function->end) {
// Continuation singletons past the end of the source file.
DCHECK_EQ(block.end, kNoSourcePosition);
nesting_stack.resize(1);
break;
}
while (nesting_stack.back().end <= block.start) {
nesting_stack.pop_back();
}
......
src/interpreter/bytecode-generator.cc
View file @ b6bbfaec
......@@ -1277,16 +1277,22 @@ void BytecodeGenerator::VisitSloppyBlockFunctionStatement(
}
void BytecodeGenerator::VisitContinueStatement(ContinueStatement* stmt) {
AllocateBlockCoverageSlotIfEnabled(
{stmt->continuation_pos(), kNoSourcePosition});
builder()->SetStatementPosition(stmt);
execution_control()->Continue(stmt->target());
}
void BytecodeGenerator::VisitBreakStatement(BreakStatement* stmt) {
AllocateBlockCoverageSlotIfEnabled(
{stmt->continuation_pos(), kNoSourcePosition});
builder()->SetStatementPosition(stmt);
execution_control()->Break(stmt->target());
}
void BytecodeGenerator::VisitReturnStatement(ReturnStatement* stmt) {
AllocateBlockCoverageSlotIfEnabled(
{stmt->continuation_pos(), kNoSourcePosition});
builder()->SetStatementPosition(stmt);
VisitForAccumulatorValue(stmt->expression());
if (stmt->is_async_return()) {
......
src/isolate.cc
View file @ b6bbfaec
......@@ -3001,7 +3001,8 @@ Map* Isolate::get_initial_js_array_map(ElementsKind kind) {
bool Isolate::use_optimizer() {
return FLAG_opt && !serializer_enabled_ &&
CpuFeatures::SupportsCrankshaft() && !is_precise_count_code_coverage();
CpuFeatures::SupportsCrankshaft() &&
!is_precise_count_code_coverage() && !is_block_count_code_coverage();
}
bool Isolate::NeedsSourcePositionsForProfiling() const {
......
src/parsing/parser-base.h
View file @ b6bbfaec
......@@ -1423,11 +1423,12 @@ class ParserBase {
// Convenience method which determines the type of return statement to emit
// depending on the current function type.
inline StatementT BuildReturnStatement(ExpressionT expr, int pos) {
inline StatementT BuildReturnStatement(
ExpressionT expr, int pos, int continuation_pos = kNoSourcePosition) {
if (is_async_function()) {
return factory()->NewAsyncReturnStatement(expr, pos);
return factory()->NewAsyncReturnStatement(expr, pos, continuation_pos);
}
return factory()->NewReturnStatement(expr, pos);
return factory()->NewReturnStatement(expr, pos, continuation_pos);
}
inline SuspendExpressionT BuildSuspend(
......@@ -5230,7 +5231,8 @@ typename ParserBase<Impl>::StatementT ParserBase<Impl>::ParseContinueStatement(
return impl()->NullStatement();
}
ExpectSemicolon(CHECK_OK);
return factory()->NewContinueStatement(target, pos);
int continuation_pos = scanner_->location().end_pos;
return factory()->NewContinueStatement(target, pos, continuation_pos);
}
template <typename Impl>
......@@ -5268,7 +5270,8 @@ typename ParserBase<Impl>::StatementT ParserBase<Impl>::ParseBreakStatement(
return impl()->NullStatement();
}
ExpectSemicolon(CHECK_OK);
return factory()->NewBreakStatement(target, pos);
int continuation_pos = scanner_->location().end_pos;
return factory()->NewBreakStatement(target, pos, continuation_pos);
}
template <typename Impl>
......@@ -5322,7 +5325,8 @@ typename ParserBase<Impl>::StatementT ParserBase<Impl>::ParseReturnStatement(
}
ExpectSemicolon(CHECK_OK);
return_value = impl()->RewriteReturn(return_value, loc.beg_pos);
return BuildReturnStatement(return_value, loc.beg_pos);
int continuation_pos = scanner_->location().end_pos;
return BuildReturnStatement(return_value, loc.beg_pos, continuation_pos);
}
template <typename Impl>
......
src/parsing/preparser.h
View file @ b6bbfaec
......@@ -675,12 +675,14 @@ class PreParserFactory {
int pos) {
return PreParserExpression::Default();
}
PreParserStatement NewReturnStatement(PreParserExpression expression,
int pos) {
PreParserStatement NewReturnStatement(
PreParserExpression expression, int pos,
int continuation_pos = kNoSourcePosition) {
return PreParserStatement::Jump();
}
PreParserStatement NewAsyncReturnStatement(PreParserExpression expression,
int pos) {
PreParserStatement NewAsyncReturnStatement(
PreParserExpression expression, int pos,
int continuation_pos = kNoSourcePosition) {
return PreParserStatement::Jump();
}
PreParserExpression NewFunctionLiteral(
......@@ -729,11 +731,15 @@ class PreParserFactory {
return else_statement.IsJumpStatement() ? then_statement : else_statement;
}
PreParserStatement NewBreakStatement(PreParserStatement target, int pos) {
PreParserStatement NewBreakStatement(
PreParserStatement target, int pos,
int continuation_pos = kNoSourcePosition) {
return PreParserStatement::Jump();
}
PreParserStatement NewContinueStatement(PreParserStatement target, int pos) {
PreParserStatement NewContinueStatement(
PreParserStatement target, int pos,
int continuation_pos = kNoSourcePosition) {
return PreParserStatement::Jump();
}
......
test/inspector/cpu-profiler/coverage-block-expected.txt
View file @ b6bbfaec
......@@ -77,9 +77,14 @@ Running test: testPreciseCountCoverage
}
[2] : {
count : 7
endOffset : 73
endOffset : 71
startOffset : 41
}
[3] : {
count : 0
endOffset : 73
startOffset : 71
}
]
}
[2] : {
......@@ -102,6 +107,11 @@ Running test: testPreciseCountCoverage
endOffset : 208
startOffset : 177
}
[1] : {
count : 0
endOffset : 208
startOffset : 206
}
]
}
]
......@@ -385,9 +395,14 @@ Running test: testBestEffortCoverageWithPreciseCountEnabled
}
[2] : {
count : 7
endOffset : 73
endOffset : 71
startOffset : 41
}
[3] : {
count : 0
endOffset : 73
startOffset : 71
}
]
}
[2] : {
......@@ -410,6 +425,11 @@ Running test: testBestEffortCoverageWithPreciseCountEnabled
endOffset : 208
startOffset : 177
}
[1] : {
count : 0
endOffset : 208
startOffset : 206
}
]
}
]
......@@ -469,9 +489,14 @@ Running test: testBestEffortCoverageWithPreciseCountEnabled
}
[2] : {
count : 7
endOffset : 73
endOffset : 71
startOffset : 41
}
[3] : {
count : 0
endOffset : 73
startOffset : 71
}
]
}
[2] : {
......@@ -494,6 +519,11 @@ Running test: testBestEffortCoverageWithPreciseCountEnabled
endOffset : 208
startOffset : 177
}
[1] : {
count : 0
endOffset : 208
startOffset : 206
}
]
}
]
......@@ -804,6 +834,11 @@ Running test: testPreciseCountCoveragePartial
endOffset : 224
startOffset : 10
}
[1] : {
count : 0
endOffset : 224
startOffset : 222
}
]
}
[2] : {
......@@ -815,6 +850,11 @@ Running test: testPreciseCountCoveragePartial
endOffset : 176
startOffset : 31
}
[1] : {
count : 0
endOffset : 176
startOffset : 172
}
]
}
[3] : {
......@@ -826,6 +866,11 @@ Running test: testPreciseCountCoveragePartial
endOffset : 172
startOffset : 64
}
[1] : {
count : 0
endOffset : 172
startOffset : 166
}
]
}
[4] : {
......@@ -837,6 +882,11 @@ Running test: testPreciseCountCoveragePartial
endOffset : 166
startOffset : 99
}
[1] : {
count : 0
endOffset : 166
startOffset : 158
}
]
}
[5] : {
......@@ -883,6 +933,11 @@ Running test: testPreciseCountCoveragePartial
endOffset : 172
startOffset : 64
}
[1] : {
count : 0
endOffset : 172
startOffset : 166
}
]
}
[1] : {
......@@ -894,6 +949,11 @@ Running test: testPreciseCountCoveragePartial
endOffset : 166
startOffset : 99
}
[1] : {
count : 0
endOffset : 166
startOffset : 158
}
]
}
]
......
test/mjsunit/code-coverage-block.js
View file @ b6bbfaec
......@@ -103,6 +103,7 @@ TestCoverage(
[{"start":0,"end":399,"count":1},
{"start":1,"end":351,"count":1},
{"start":62,"end":253,"count":1},
{"start":161,"end":253,"count":0},
{"start":253,"end":351,"count":0}]
);
......@@ -231,10 +232,13 @@ TestCoverage(
[{"start":0,"end":999,"count":1},
{"start":1,"end":951,"count":1},
{"start":81,"end":253,"count":10},
{"start":163,"end":253,"count":0},
{"start":253,"end":361,"count":1},
{"start":361,"end":553,"count":1},
{"start":460,"end":553,"count":0},
{"start":553,"end":661,"count":1},
{"start":661,"end":853,"count":1},
{"start":761,"end":853,"count":0},
{"start":853,"end":951,"count":0}]
);
......@@ -274,6 +278,7 @@ function g() {} // 0000
{"start":562,"end":570,"count":1},
{"start":570,"end":612,"count":1},
{"start":612,"end":622,"count":1},
{"start":620,"end":622,"count":0},
{"start":622,"end":651,"count":1}]
);
......@@ -305,10 +310,13 @@ TestCoverage(
[{"start":0,"end":1049,"count":1},
{"start":1,"end":1001,"count":1},
{"start":117,"end":303,"count":10},
{"start":213,"end":303,"count":0},
{"start":303,"end":415,"count":1},
{"start":415,"end":603,"count":1},
{"start":510,"end":603,"count":0},
{"start":603,"end":715,"count":1},
{"start":715,"end":903,"count":1},
{"start":811,"end":903,"count":0},
{"start":903,"end":1001,"count":0}]
);
......@@ -340,11 +348,28 @@ TestCoverage(
[{"start":0,"end":1049,"count":1},
{"start":1,"end":1001,"count":1},
{"start":105,"end":303,"count":10},
{"start":213,"end":303,"count":0},
{"start":303,"end":405,"count":1},
{"start":405,"end":603,"count":1},
{"start":510,"end":603,"count":0},
{"start":603,"end":705,"count":1},
{"start":705,"end":903,"count":1},
{"start":811,"end":903,"count":0},
{"start":903,"end":1001,"count":0}]
);
TestCoverage(
"return statements",
`
!function() { nop(); return; nop(); }(); // 0000
!function() { nop(); return 42; // 0050
nop(); }(); // 0100
`,
[{"start":0,"end":149,"count":1},
{"start":1,"end":37,"count":1},
{"start":28,"end":37,"count":0},
{"start":51,"end":122,"count":1},
{"start":81,"end":122,"count":0}]
);
%DebugToggleBlockCoverage(false);
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