Merge V8 5.3.332.45. DO NOT MERGE
Test: Manual
FPIIM-449
Change-Id: Id3254828b068abdea3cb10442e0172a8c9a98e03
(cherry picked from commit 13e2dadd00298019ed862f2b2fc5068bba730bcf)
diff --git a/src/ast/ast-expression-visitor.cc b/src/ast/ast-expression-visitor.cc
index 91d4afb..7536d90 100644
--- a/src/ast/ast-expression-visitor.cc
+++ b/src/ast/ast-expression-visitor.cc
@@ -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);
-}
+ : AstTraversalVisitor(stack_limit), root_(root) {}
-
-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) {}
-
+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);
}