Skip to content

V
V8
Commit eb488c1f authored by jgruber's avatar jgruber Committed by Commit bot
Browse files
Options

Refactor duplicate logic in Ast{Traversal,Expression}Visitor 

Add stack overflow checks to AstTraversalVisitor, and let
AstExpressionVisitor reuse traversal logic from AstTraversalVisitor.

R=yangguo@chromium.org
BUG=

Review-Url: https://codereview.chromium.org/2004363002
Cr-Commit-Position: refs/heads/master@{#36500}
parent 53d4594b
Hide whitespace changes
Inline Side-by-side
Showing with 156 additions and 381 deletions
src/ast/ast-expression-visitor.cc
View file @ eb488c1f
......@@ -13,395 +13,153 @@
namespace v8 {
namespace internal {
#define RECURSE(call) \
do { \
DCHECK(!HasStackOverflow()); \
call; \
if (HasStackOverflow()) return; \
} while (false)
#define RECURSE_EXPRESSION(call) \
do { \
DCHECK(!HasStackOverflow()); \
++depth_; \
call; \
--depth_; \
if (HasStackOverflow()) return; \
} while (false)
AstExpressionVisitor::AstExpressionVisitor(Isolate* isolate, Expression* root)
: root_(root), depth_(0) {
InitializeAstVisitor(isolate);
}
: AstTraversalVisitor(isolate), root_(root) {}
AstExpressionVisitor::AstExpressionVisitor(uintptr_t stack_limit,
Expression* root)
: root_(root), depth_(0) {
InitializeAstVisitor(stack_limit);
}
void AstExpressionVisitor::Run() { RECURSE(Visit(root_)); }
void AstExpressionVisitor::VisitVariableDeclaration(VariableDeclaration* decl) {
}
void AstExpressionVisitor::VisitFunctionDeclaration(FunctionDeclaration* decl) {
RECURSE(Visit(decl->fun()));
}
void AstExpressionVisitor::VisitImportDeclaration(ImportDeclaration* decl) {}
void AstExpressionVisitor::VisitExportDeclaration(ExportDeclaration* decl) {}
void AstExpressionVisitor::VisitStatements(ZoneList<Statement*>* stmts) {
for (int i = 0; i < stmts->length(); ++i) {
Statement* stmt = stmts->at(i);
RECURSE(Visit(stmt));
if (stmt->IsJump()) break;
}
}
void AstExpressionVisitor::VisitBlock(Block* stmt) {
RECURSE(VisitStatements(stmt->statements()));
}
void AstExpressionVisitor::VisitExpressionStatement(ExpressionStatement* stmt) {
RECURSE(Visit(stmt->expression()));
}
void AstExpressionVisitor::VisitEmptyStatement(EmptyStatement* stmt) {}
void AstExpressionVisitor::VisitSloppyBlockFunctionStatement(
SloppyBlockFunctionStatement* stmt) {
RECURSE(Visit(stmt->statement()));
}
void AstExpressionVisitor::VisitIfStatement(IfStatement* stmt) {
RECURSE(Visit(stmt->condition()));
RECURSE(Visit(stmt->then_statement()));
RECURSE(Visit(stmt->else_statement()));
}
void AstExpressionVisitor::VisitContinueStatement(ContinueStatement* stmt) {}
void AstExpressionVisitor::VisitBreakStatement(BreakStatement* stmt) {}
void AstExpressionVisitor::VisitReturnStatement(ReturnStatement* stmt) {
RECURSE(Visit(stmt->expression()));
}
void AstExpressionVisitor::VisitWithStatement(WithStatement* stmt) {
RECURSE(stmt->expression());
RECURSE(stmt->statement());
}
void AstExpressionVisitor::VisitSwitchStatement(SwitchStatement* stmt) {
RECURSE(Visit(stmt->tag()));
ZoneList<CaseClause*>* clauses = stmt->cases();
for (int i = 0; i < clauses->length(); ++i) {
CaseClause* clause = clauses->at(i);
if (!clause->is_default()) {
Expression* label = clause->label();
RECURSE(Visit(label));
}
ZoneList<Statement*>* stmts = clause->statements();
RECURSE(VisitStatements(stmts));
}
}
void AstExpressionVisitor::VisitCaseClause(CaseClause* clause) {
UNREACHABLE();
}
void AstExpressionVisitor::VisitDoWhileStatement(DoWhileStatement* stmt) {
RECURSE(Visit(stmt->body()));
RECURSE(Visit(stmt->cond()));
}
void AstExpressionVisitor::VisitWhileStatement(WhileStatement* stmt) {
RECURSE(Visit(stmt->cond()));
RECURSE(Visit(stmt->body()));
}
void AstExpressionVisitor::VisitForStatement(ForStatement* stmt) {
if (stmt->init() != NULL) {
RECURSE(Visit(stmt->init()));
}
if (stmt->cond() != NULL) {
RECURSE(Visit(stmt->cond()));
}
if (stmt->next() != NULL) {
RECURSE(Visit(stmt->next()));
}
RECURSE(Visit(stmt->body()));
}
void AstExpressionVisitor::VisitForInStatement(ForInStatement* stmt) {
RECURSE(Visit(stmt->enumerable()));
RECURSE(Visit(stmt->body()));
}
void AstExpressionVisitor::VisitForOfStatement(ForOfStatement* stmt) {
RECURSE(Visit(stmt->assign_iterator()));
RECURSE(Visit(stmt->next_result()));
RECURSE(Visit(stmt->result_done()));
RECURSE(Visit(stmt->assign_each()));
RECURSE(Visit(stmt->body()));
}
void AstExpressionVisitor::VisitTryCatchStatement(TryCatchStatement* stmt) {
RECURSE(Visit(stmt->try_block()));
RECURSE(Visit(stmt->catch_block()));
}
void AstExpressionVisitor::VisitTryFinallyStatement(TryFinallyStatement* stmt) {
RECURSE(Visit(stmt->try_block()));
RECURSE(Visit(stmt->finally_block()));
}
void AstExpressionVisitor::VisitDebuggerStatement(DebuggerStatement* stmt) {}
: AstTraversalVisitor(stack_limit), root_(root) {}
void AstExpressionVisitor::Run() { Visit(root_); }
void AstExpressionVisitor::VisitFunctionLiteral(FunctionLiteral* expr) {
Scope* scope = expr->scope();
VisitExpression(expr);
RECURSE_EXPRESSION(VisitDeclarations(scope->declarations()));
RECURSE_EXPRESSION(VisitStatements(expr->body()));
AstTraversalVisitor::VisitFunctionLiteral(expr);
}
void AstExpressionVisitor::VisitNativeFunctionLiteral(
NativeFunctionLiteral* expr) {}
NativeFunctionLiteral* expr) {
AstTraversalVisitor::VisitNativeFunctionLiteral(expr);
}
void AstExpressionVisitor::VisitDoExpression(DoExpression* expr) {
VisitExpression(expr);
RECURSE(VisitBlock(expr->block()));
RECURSE(VisitVariableProxy(expr->result()));
AstTraversalVisitor::VisitDoExpression(expr);
}
void AstExpressionVisitor::VisitConditional(Conditional* expr) {
VisitExpression(expr);
RECURSE_EXPRESSION(Visit(expr->condition()));
RECURSE_EXPRESSION(Visit(expr->then_expression()));
RECURSE_EXPRESSION(Visit(expr->else_expression()));
AstTraversalVisitor::VisitConditional(expr);
}
void AstExpressionVisitor::VisitVariableProxy(VariableProxy* expr) {
VisitExpression(expr);
AstTraversalVisitor::VisitVariableProxy(expr);
}
void AstExpressionVisitor::VisitLiteral(Literal* expr) {
VisitExpression(expr);
AstTraversalVisitor::VisitLiteral(expr);
}
void AstExpressionVisitor::VisitRegExpLiteral(RegExpLiteral* expr) {
VisitExpression(expr);
AstTraversalVisitor::VisitRegExpLiteral(expr);
}
void AstExpressionVisitor::VisitObjectLiteral(ObjectLiteral* expr) {
VisitExpression(expr);
ZoneList<ObjectLiteralProperty*>* props = expr->properties();
for (int i = 0; i < props->length(); ++i) {
ObjectLiteralProperty* prop = props->at(i);
if (!prop->key()->IsLiteral()) {
RECURSE_EXPRESSION(Visit(prop->key()));
}
RECURSE_EXPRESSION(Visit(prop->value()));
}
AstTraversalVisitor::VisitObjectLiteral(expr);
}
void AstExpressionVisitor::VisitArrayLiteral(ArrayLiteral* expr) {
VisitExpression(expr);
ZoneList<Expression*>* values = expr->values();
for (int i = 0; i < values->length(); ++i) {
Expression* value = values->at(i);
RECURSE_EXPRESSION(Visit(value));
}
AstTraversalVisitor::VisitArrayLiteral(expr);
}
void AstExpressionVisitor::VisitAssignment(Assignment* expr) {
VisitExpression(expr);
RECURSE_EXPRESSION(Visit(expr->target()));
RECURSE_EXPRESSION(Visit(expr->value()));
AstTraversalVisitor::VisitAssignment(expr);
}
void AstExpressionVisitor::VisitYield(Yield* expr) {
VisitExpression(expr);
RECURSE_EXPRESSION(Visit(expr->generator_object()));
RECURSE_EXPRESSION(Visit(expr->expression()));
AstTraversalVisitor::VisitYield(expr);
}
void AstExpressionVisitor::VisitThrow(Throw* expr) {
VisitExpression(expr);
RECURSE_EXPRESSION(Visit(expr->exception()));
AstTraversalVisitor::VisitThrow(expr);
}
void AstExpressionVisitor::VisitProperty(Property* expr) {
VisitExpression(expr);
RECURSE_EXPRESSION(Visit(expr->obj()));
RECURSE_EXPRESSION(Visit(expr->key()));
AstTraversalVisitor::VisitProperty(expr);
}
void AstExpressionVisitor::VisitCall(Call* expr) {
VisitExpression(expr);
RECURSE_EXPRESSION(Visit(expr->expression()));
ZoneList<Expression*>* args = expr->arguments();
for (int i = 0; i < args->length(); ++i) {
Expression* arg = args->at(i);
RECURSE_EXPRESSION(Visit(arg));
}
AstTraversalVisitor::VisitCall(expr);
}
void AstExpressionVisitor::VisitCallNew(CallNew* expr) {
VisitExpression(expr);
RECURSE_EXPRESSION(Visit(expr->expression()));
ZoneList<Expression*>* args = expr->arguments();
for (int i = 0; i < args->length(); ++i) {
Expression* arg = args->at(i);
RECURSE_EXPRESSION(Visit(arg));
}
AstTraversalVisitor::VisitCallNew(expr);
}
void AstExpressionVisitor::VisitCallRuntime(CallRuntime* expr) {
VisitExpression(expr);
ZoneList<Expression*>* args = expr->arguments();
for (int i = 0; i < args->length(); ++i) {
Expression* arg = args->at(i);
RECURSE_EXPRESSION(Visit(arg));
}
AstTraversalVisitor::VisitCallRuntime(expr);
}
void AstExpressionVisitor::VisitUnaryOperation(UnaryOperation* expr) {
VisitExpression(expr);
RECURSE_EXPRESSION(Visit(expr->expression()));
AstTraversalVisitor::VisitUnaryOperation(expr);
}
void AstExpressionVisitor::VisitCountOperation(CountOperation* expr) {
VisitExpression(expr);
RECURSE_EXPRESSION(Visit(expr->expression()));
AstTraversalVisitor::VisitCountOperation(expr);
}
void AstExpressionVisitor::VisitBinaryOperation(BinaryOperation* expr) {
VisitExpression(expr);
RECURSE_EXPRESSION(Visit(expr->left()));
RECURSE_EXPRESSION(Visit(expr->right()));
AstTraversalVisitor::VisitBinaryOperation(expr);
}
void AstExpressionVisitor::VisitCompareOperation(CompareOperation* expr) {
VisitExpression(expr);
RECURSE_EXPRESSION(Visit(expr->left()));
RECURSE_EXPRESSION(Visit(expr->right()));
AstTraversalVisitor::VisitCompareOperation(expr);
}
void AstExpressionVisitor::VisitThisFunction(ThisFunction* expr) {
VisitExpression(expr);
AstTraversalVisitor::VisitThisFunction(expr);
}
void AstExpressionVisitor::VisitDeclarations(ZoneList<Declaration*>* decls) {
for (int i = 0; i < decls->length(); ++i) {
Declaration* decl = decls->at(i);
RECURSE(Visit(decl));
}
}
void AstExpressionVisitor::VisitClassLiteral(ClassLiteral* expr) {
VisitExpression(expr);
if (expr->extends() != nullptr) {
RECURSE_EXPRESSION(Visit(expr->extends()));
}
RECURSE_EXPRESSION(Visit(expr->constructor()));
ZoneList<ObjectLiteralProperty*>* props = expr->properties();
for (int i = 0; i < props->length(); ++i) {
ObjectLiteralProperty* prop = props->at(i);
if (!prop->key()->IsLiteral()) {
RECURSE_EXPRESSION(Visit(prop->key()));
}
RECURSE_EXPRESSION(Visit(prop->value()));
}
AstTraversalVisitor::VisitClassLiteral(expr);
}
void AstExpressionVisitor::VisitSpread(Spread* expr) {
VisitExpression(expr);
RECURSE_EXPRESSION(Visit(expr->expression()));
AstTraversalVisitor::VisitSpread(expr);
}
void AstExpressionVisitor::VisitEmptyParentheses(EmptyParentheses* expr) {}
void AstExpressionVisitor::VisitSuperPropertyReference(
SuperPropertyReference* expr) {
VisitExpression(expr);
RECURSE_EXPRESSION(VisitVariableProxy(expr->this_var()));
RECURSE_EXPRESSION(Visit(expr->home_object()));
AstTraversalVisitor::VisitSuperPropertyReference(expr);
}
void AstExpressionVisitor::VisitSuperCallReference(SuperCallReference* expr) {
VisitExpression(expr);
RECURSE_EXPRESSION(VisitVariableProxy(expr->this_var()));
RECURSE_EXPRESSION(VisitVariableProxy(expr->new_target_var()));
RECURSE_EXPRESSION(VisitVariableProxy(expr->this_function_var()));
AstTraversalVisitor::VisitSuperCallReference(expr);
}
void AstExpressionVisitor::VisitCaseClause(CaseClause* expr) {
AstTraversalVisitor::VisitCaseClause(expr);
}
void AstExpressionVisitor::VisitEmptyParentheses(EmptyParentheses* expr) {
AstTraversalVisitor::VisitEmptyParentheses(expr);
}
void AstExpressionVisitor::VisitRewritableExpression(
RewritableExpression* expr) {
VisitExpression(expr);
RECURSE(Visit(expr->expression()));
AstTraversalVisitor::VisitRewritableExpression(expr);
}
......
src/ast/ast-expression-visitor.h
View file @ eb488c1f
......@@ -17,7 +17,7 @@ namespace internal {
// A Visitor over a CompilationInfo's AST that invokes
// VisitExpression on each expression node.
class AstExpressionVisitor : public AstVisitor {
class AstExpressionVisitor : public AstTraversalVisitor {
public:
AstExpressionVisitor(Isolate* isolate, Expression* root);
AstExpressionVisitor(uintptr_t stack_limit, Expression* root);
......@@ -25,20 +25,13 @@ class AstExpressionVisitor : public AstVisitor {
protected:
virtual void VisitExpression(Expression* expression) = 0;
int depth() { return depth_; }
void VisitDeclarations(ZoneList<Declaration*>* d) override;
void VisitStatements(ZoneList<Statement*>* s) override;
private:
DEFINE_AST_VISITOR_SUBCLASS_MEMBERS();
#define DECLARE_VISIT(type) void Visit##type(type* node) override;
AST_NODE_LIST(DECLARE_VISIT)
EXPRESSION_NODE_LIST(DECLARE_VISIT)
#undef DECLARE_VISIT
Expression* root_;
int depth_;
DISALLOW_COPY_AND_ASSIGN(AstExpressionVisitor);
};
......
src/ast/ast.cc
View file @ eb488c1f
......@@ -816,54 +816,74 @@ void AstVisitor::VisitExpressions(ZoneList<Expression*>* expressions) {
// ----------------------------------------------------------------------------
// Implementation of AstTraversalVisitor
AstTraversalVisitor::AstTraversalVisitor(Isolate* isolate) {
#define RECURSE(call) \
do { \
DCHECK(!HasStackOverflow()); \
call; \
if (HasStackOverflow()) return; \
} while (false)
#define RECURSE_EXPRESSION(call) \
do { \
DCHECK(!HasStackOverflow()); \
++depth_; \
call; \
--depth_; \
if (HasStackOverflow()) return; \
} while (false)
AstTraversalVisitor::AstTraversalVisitor(Isolate* isolate) : depth_(0) {
InitializeAstVisitor(isolate);
}
void AstTraversalVisitor::VisitVariableDeclaration(VariableDeclaration* decl) {}
void AstTraversalVisitor::VisitFunctionDeclaration(FunctionDeclaration* decl) {
Visit(decl->fun());
AstTraversalVisitor::AstTraversalVisitor(uintptr_t stack_limit) : depth_(0) {
InitializeAstVisitor(stack_limit);
}
void AstTraversalVisitor::VisitImportDeclaration(ImportDeclaration* decl) {}
void AstTraversalVisitor::VisitExportDeclaration(ExportDeclaration* decl) {}
void AstTraversalVisitor::VisitDeclarations(ZoneList<Declaration*>* decls) {
for (int i = 0; i < decls->length(); ++i) {
Declaration* decl = decls->at(i);
RECURSE(Visit(decl));
}
}
void AstTraversalVisitor::VisitStatements(ZoneList<Statement*>* stmts) {
for (int i = 0; i < stmts->length(); ++i) {
Statement* stmt = stmts->at(i);
Visit(stmt);
RECURSE(Visit(stmt));
if (stmt->IsJump()) break;
}
}
void AstTraversalVisitor::VisitExpressions(ZoneList<Expression*>* expressions) {
for (int i = 0; i < expressions->length(); i++) {
Expression* expression = expressions->at(i);
if (expression != NULL) Visit(expression);
}
void AstTraversalVisitor::VisitVariableDeclaration(VariableDeclaration* decl) {}
void AstTraversalVisitor::VisitFunctionDeclaration(FunctionDeclaration* decl) {
RECURSE(Visit(decl->fun()));
}
void AstTraversalVisitor::VisitImportDeclaration(ImportDeclaration* decl) {}
void AstTraversalVisitor::VisitExportDeclaration(ExportDeclaration* decl) {}
void AstTraversalVisitor::VisitBlock(Block* stmt) {
VisitStatements(stmt->statements());
RECURSE(VisitStatements(stmt->statements()));
}
void AstTraversalVisitor::VisitExpressionStatement(ExpressionStatement* stmt) {
Visit(stmt->expression());
RECURSE(Visit(stmt->expression()));
}
void AstTraversalVisitor::VisitEmptyStatement(EmptyStatement* stmt) {}
void AstTraversalVisitor::VisitSloppyBlockFunctionStatement(
SloppyBlockFunctionStatement* stmt) {
Visit(stmt->statement());
RECURSE(Visit(stmt->statement()));
}
void AstTraversalVisitor::VisitIfStatement(IfStatement* stmt) {
Visit(stmt->condition());
Visit(stmt->then_statement());
Visit(stmt->else_statement());
RECURSE(Visit(stmt->condition()));
RECURSE(Visit(stmt->then_statement()));
RECURSE(Visit(stmt->else_statement()));
}
void AstTraversalVisitor::VisitContinueStatement(ContinueStatement* stmt) {}
......@@ -871,16 +891,16 @@ void AstTraversalVisitor::VisitContinueStatement(ContinueStatement* stmt) {}
void AstTraversalVisitor::VisitBreakStatement(BreakStatement* stmt) {}
void AstTraversalVisitor::VisitReturnStatement(ReturnStatement* stmt) {
Visit(stmt->expression());
RECURSE(Visit(stmt->expression()));
}
void AstTraversalVisitor::VisitWithStatement(WithStatement* stmt) {
stmt->expression();
stmt->statement();
RECURSE(stmt->expression());
RECURSE(stmt->statement());
}
void AstTraversalVisitor::VisitSwitchStatement(SwitchStatement* stmt) {
Visit(stmt->tag());
RECURSE(Visit(stmt->tag()));
ZoneList<CaseClause*>* clauses = stmt->cases();
......@@ -888,81 +908,81 @@ void AstTraversalVisitor::VisitSwitchStatement(SwitchStatement* stmt) {
CaseClause* clause = clauses->at(i);
if (!clause->is_default()) {
Expression* label = clause->label();
Visit(label);
RECURSE(Visit(label));
}
ZoneList<Statement*>* stmts = clause->statements();
VisitStatements(stmts);
RECURSE(VisitStatements(stmts));
}
}
void AstTraversalVisitor::VisitCaseClause(CaseClause* clause) { UNREACHABLE(); }
void AstTraversalVisitor::VisitDoWhileStatement(DoWhileStatement* stmt) {
Visit(stmt->body());
Visit(stmt->cond());
RECURSE(Visit(stmt->body()));
RECURSE(Visit(stmt->cond()));
}
void AstTraversalVisitor::VisitWhileStatement(WhileStatement* stmt) {
Visit(stmt->cond());
Visit(stmt->body());
RECURSE(Visit(stmt->cond()));
RECURSE(Visit(stmt->body()));
}
void AstTraversalVisitor::VisitForStatement(ForStatement* stmt) {
if (stmt->init() != NULL) {
Visit(stmt->init());
RECURSE(Visit(stmt->init()));
}
if (stmt->cond() != NULL) {
Visit(stmt->cond());
RECURSE(Visit(stmt->cond()));
}
if (stmt->next() != NULL) {
Visit(stmt->next());
RECURSE(Visit(stmt->next()));
}
Visit(stmt->body());
RECURSE(Visit(stmt->body()));
}
void AstTraversalVisitor::VisitForInStatement(ForInStatement* stmt) {
Visit(stmt->enumerable());
Visit(stmt->body());
RECURSE(Visit(stmt->enumerable()));
RECURSE(Visit(stmt->body()));
}
void AstTraversalVisitor::VisitForOfStatement(ForOfStatement* stmt) {
Visit(stmt->assign_iterator());
Visit(stmt->next_result());
Visit(stmt->result_done());
Visit(stmt->assign_each());
Visit(stmt->body());
RECURSE(Visit(stmt->assign_iterator()));
RECURSE(Visit(stmt->next_result()));
RECURSE(Visit(stmt->result_done()));
RECURSE(Visit(stmt->assign_each()));
RECURSE(Visit(stmt->body()));
}
void AstTraversalVisitor::VisitTryCatchStatement(TryCatchStatement* stmt) {
Visit(stmt->try_block());
Visit(stmt->catch_block());
RECURSE(Visit(stmt->try_block()));
RECURSE(Visit(stmt->catch_block()));
}
void AstTraversalVisitor::VisitTryFinallyStatement(TryFinallyStatement* stmt) {
Visit(stmt->try_block());
Visit(stmt->finally_block());
RECURSE(Visit(stmt->try_block()));
RECURSE(Visit(stmt->finally_block()));
}
void AstTraversalVisitor::VisitDebuggerStatement(DebuggerStatement* stmt) {}
void AstTraversalVisitor::VisitFunctionLiteral(FunctionLiteral* expr) {
Scope* scope = expr->scope();
VisitDeclarations(scope->declarations());
VisitStatements(expr->body());
RECURSE_EXPRESSION(VisitDeclarations(scope->declarations()));
RECURSE_EXPRESSION(VisitStatements(expr->body()));
}
void AstTraversalVisitor::VisitNativeFunctionLiteral(
NativeFunctionLiteral* expr) {}
void AstTraversalVisitor::VisitDoExpression(DoExpression* expr) {
VisitBlock(expr->block());
VisitVariableProxy(expr->result());
RECURSE(VisitBlock(expr->block()));
RECURSE(VisitVariableProxy(expr->result()));
}
void AstTraversalVisitor::VisitConditional(Conditional* expr) {
Visit(expr->condition());
Visit(expr->then_expression());
Visit(expr->else_expression());
RECURSE_EXPRESSION(Visit(expr->condition()));
RECURSE_EXPRESSION(Visit(expr->then_expression()));
RECURSE_EXPRESSION(Visit(expr->else_expression()));
}
void AstTraversalVisitor::VisitVariableProxy(VariableProxy* expr) {}
......@@ -976,9 +996,9 @@ void AstTraversalVisitor::VisitObjectLiteral(ObjectLiteral* expr) {
for (int i = 0; i < props->length(); ++i) {
ObjectLiteralProperty* prop = props->at(i);
if (!prop->key()->IsLiteral()) {
Visit(prop->key());
RECURSE_EXPRESSION(Visit(prop->key()));
}
Visit(prop->value());
RECURSE_EXPRESSION(Visit(prop->value()));
}
}
......@@ -986,42 +1006,44 @@ void AstTraversalVisitor::VisitArrayLiteral(ArrayLiteral* expr) {
ZoneList<Expression*>* values = expr->values();
for (int i = 0; i < values->length(); ++i) {
Expression* value = values->at(i);
Visit(value);
RECURSE_EXPRESSION(Visit(value));
}
}
void AstTraversalVisitor::VisitAssignment(Assignment* expr) {
Visit(expr->target());
Visit(expr->value());
RECURSE_EXPRESSION(Visit(expr->target()));
RECURSE_EXPRESSION(Visit(expr->value()));
}
void AstTraversalVisitor::VisitYield(Yield* expr) {
Visit(expr->generator_object());
Visit(expr->expression());
RECURSE_EXPRESSION(Visit(expr->generator_object()));
RECURSE_EXPRESSION(Visit(expr->expression()));
}
void AstTraversalVisitor::VisitThrow(Throw* expr) { Visit(expr->exception()); }
void AstTraversalVisitor::VisitThrow(Throw* expr) {
RECURSE_EXPRESSION(Visit(expr->exception()));
}
void AstTraversalVisitor::VisitProperty(Property* expr) {
Visit(expr->obj());
Visit(expr->key());
RECURSE_EXPRESSION(Visit(expr->obj()));
RECURSE_EXPRESSION(Visit(expr->key()));
}
void AstTraversalVisitor::VisitCall(Call* expr) {
Visit(expr->expression());
RECURSE_EXPRESSION(Visit(expr->expression()));
ZoneList<Expression*>* args = expr->arguments();
for (int i = 0; i < args->length(); ++i) {
Expression* arg = args->at(i);
Visit(arg);
RECURSE_EXPRESSION(Visit(arg));
}
}
void AstTraversalVisitor::VisitCallNew(CallNew* expr) {
Visit(expr->expression());
RECURSE_EXPRESSION(Visit(expr->expression()));
ZoneList<Expression*>* args = expr->arguments();
for (int i = 0; i < args->length(); ++i) {
Expression* arg = args->at(i);
Visit(arg);
RECURSE_EXPRESSION(Visit(arg));
}
}
......@@ -1029,75 +1051,71 @@ void AstTraversalVisitor::VisitCallRuntime(CallRuntime* expr) {
ZoneList<Expression*>* args = expr->arguments();
for (int i = 0; i < args->length(); ++i) {
Expression* arg = args->at(i);
Visit(arg);
RECURSE_EXPRESSION(Visit(arg));
}
}
void AstTraversalVisitor::VisitUnaryOperation(UnaryOperation* expr) {
Visit(expr->expression());
RECURSE_EXPRESSION(Visit(expr->expression()));
}
void AstTraversalVisitor::VisitCountOperation(CountOperation* expr) {
Visit(expr->expression());
RECURSE_EXPRESSION(Visit(expr->expression()));
}
void AstTraversalVisitor::VisitBinaryOperation(BinaryOperation* expr) {
Visit(expr->left());
Visit(expr->right());
RECURSE_EXPRESSION(Visit(expr->left()));
RECURSE_EXPRESSION(Visit(expr->right()));
}
void AstTraversalVisitor::VisitCompareOperation(CompareOperation* expr) {
Visit(expr->left());
Visit(expr->right());
RECURSE_EXPRESSION(Visit(expr->left()));
RECURSE_EXPRESSION(Visit(expr->right()));
}
void AstTraversalVisitor::VisitThisFunction(ThisFunction* expr) {}
void AstTraversalVisitor::VisitDeclarations(ZoneList<Declaration*>* decls) {
for (int i = 0; i < decls->length(); ++i) {
Declaration* decl = decls->at(i);
Visit(decl);
}
}
void AstTraversalVisitor::VisitClassLiteral(ClassLiteral* expr) {
if (expr->extends() != nullptr) {
Visit(expr->extends());
RECURSE_EXPRESSION(Visit(expr->extends()));
}
Visit(expr->constructor());
RECURSE_EXPRESSION(Visit(expr->constructor()));
ZoneList<ObjectLiteralProperty*>* props = expr->properties();
for (int i = 0; i < props->length(); ++i) {
ObjectLiteralProperty* prop = props->at(i);
if (!prop->key()->IsLiteral()) {
Visit(prop->key());
RECURSE_EXPRESSION(Visit(prop->key()));
}
Visit(prop->value());
RECURSE_EXPRESSION(Visit(prop->value()));
}
}
void AstTraversalVisitor::VisitSpread(Spread* expr) {
Visit(expr->expression());
RECURSE_EXPRESSION(Visit(expr->expression()));
}
void AstTraversalVisitor::VisitEmptyParentheses(EmptyParentheses* expr) {}
void AstTraversalVisitor::VisitSuperPropertyReference(
SuperPropertyReference* expr) {
VisitVariableProxy(expr->this_var());
Visit(expr->home_object());
RECURSE_EXPRESSION(VisitVariableProxy(expr->this_var()));
RECURSE_EXPRESSION(Visit(expr->home_object()));
}
void AstTraversalVisitor::VisitSuperCallReference(SuperCallReference* expr) {
VisitVariableProxy(expr->this_var());
VisitVariableProxy(expr->new_target_var());
VisitVariableProxy(expr->this_function_var());
RECURSE_EXPRESSION(VisitVariableProxy(expr->this_var()));
RECURSE_EXPRESSION(VisitVariableProxy(expr->new_target_var()));
RECURSE_EXPRESSION(VisitVariableProxy(expr->this_function_var()));
}
void AstTraversalVisitor::VisitRewritableExpression(
RewritableExpression* expr) {
Visit(expr->expression());
RECURSE(Visit(expr->expression()));
}
#undef RECURSE_EXPRESSION
#undef RECURSE
CaseClause::CaseClause(Zone* zone, Expression* label,
ZoneList<Statement*>* statements, int pos)
: Expression(zone, pos),
......
src/ast/ast.h
View file @ eb488c1f
......@@ -3056,20 +3056,26 @@ class AstVisitor BASE_EMBEDDED {
class AstTraversalVisitor : public AstVisitor {
public:
explicit AstTraversalVisitor(Isolate* isolate);
explicit AstTraversalVisitor(uintptr_t stack_limit);
virtual ~AstTraversalVisitor() {}
// Iteration left-to-right.
void VisitDeclarations(ZoneList<Declaration*>* declarations) override;
void VisitStatements(ZoneList<Statement*>* statements) override;
void VisitExpressions(ZoneList<Expression*>* expressions) override;
// Individual nodes
#define DECLARE_VISIT(type) void Visit##type(type* node) override;
AST_NODE_LIST(DECLARE_VISIT)
#undef DECLARE_VISIT
protected:
int depth() { return depth_; }
private:
DEFINE_AST_VISITOR_SUBCLASS_MEMBERS();
int depth_;
DISALLOW_COPY_AND_ASSIGN(AstTraversalVisitor);
};
......
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