Skip to content

Commit 512175a

Browse files
isheludkoCommit Bot
authored andcommitted
[ast] Introduce ZonePtrList<T> typedef for ZoneList<T*>.
This is a preliminary step before changing the way we store zone pointers in the zones. Bug: v8:7903, v8:7754 Change-Id: I1e1af1823766c888ee0f8fe190f205f5b7e21973 Reviewed-on: https://chromium-review.googlesource.com/1118887 Reviewed-by: Ross McIlroy <[email protected]> Reviewed-by: Marja Hölttä <[email protected]> Reviewed-by: Camillo Bruni <[email protected]> Commit-Queue: Igor Sheludko <[email protected]> Cr-Commit-Position: refs/heads/master@{#54193}
1 parent b1cf1e1 commit 512175a

18 files changed

+398
-388
lines changed

src/ast/ast-traversal-visitor.h

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class AstTraversalVisitor : public AstVisitor<Subclass> {
4141

4242
// Iteration left-to-right.
4343
void VisitDeclarations(Declaration::List* declarations);
44-
void VisitStatements(ZoneList<Statement*>* statements);
44+
void VisitStatements(ZonePtrList<Statement>* statements);
4545

4646
// Individual nodes
4747
#define DECLARE_VISIT(type) void Visit##type(type* node);
@@ -112,7 +112,7 @@ void AstTraversalVisitor<Subclass>::VisitDeclarations(
112112

113113
template <class Subclass>
114114
void AstTraversalVisitor<Subclass>::VisitStatements(
115-
ZoneList<Statement*>* stmts) {
115+
ZonePtrList<Statement>* stmts) {
116116
for (int i = 0; i < stmts->length(); ++i) {
117117
Statement* stmt = stmts->at(i);
118118
RECURSE(Visit(stmt));
@@ -198,14 +198,14 @@ void AstTraversalVisitor<Subclass>::VisitSwitchStatement(
198198
PROCESS_NODE(stmt);
199199
RECURSE(Visit(stmt->tag()));
200200

201-
ZoneList<CaseClause*>* clauses = stmt->cases();
201+
ZonePtrList<CaseClause>* clauses = stmt->cases();
202202
for (int i = 0; i < clauses->length(); ++i) {
203203
CaseClause* clause = clauses->at(i);
204204
if (!clause->is_default()) {
205205
Expression* label = clause->label();
206206
RECURSE(Visit(label));
207207
}
208-
ZoneList<Statement*>* stmts = clause->statements();
208+
ZonePtrList<Statement>* stmts = clause->statements();
209209
RECURSE(VisitStatements(stmts));
210210
}
211211
}
@@ -330,7 +330,7 @@ void AstTraversalVisitor<Subclass>::VisitRegExpLiteral(RegExpLiteral* expr) {
330330
template <class Subclass>
331331
void AstTraversalVisitor<Subclass>::VisitObjectLiteral(ObjectLiteral* expr) {
332332
PROCESS_EXPRESSION(expr);
333-
ZoneList<ObjectLiteralProperty*>* props = expr->properties();
333+
ZonePtrList<ObjectLiteralProperty>* props = expr->properties();
334334
for (int i = 0; i < props->length(); ++i) {
335335
ObjectLiteralProperty* prop = props->at(i);
336336
RECURSE_EXPRESSION(Visit(prop->key()));
@@ -341,7 +341,7 @@ void AstTraversalVisitor<Subclass>::VisitObjectLiteral(ObjectLiteral* expr) {
341341
template <class Subclass>
342342
void AstTraversalVisitor<Subclass>::VisitArrayLiteral(ArrayLiteral* expr) {
343343
PROCESS_EXPRESSION(expr);
344-
ZoneList<Expression*>* values = expr->values();
344+
ZonePtrList<Expression>* values = expr->values();
345345
for (int i = 0; i < values->length(); ++i) {
346346
Expression* value = values->at(i);
347347
RECURSE_EXPRESSION(Visit(value));
@@ -404,7 +404,7 @@ template <class Subclass>
404404
void AstTraversalVisitor<Subclass>::VisitCall(Call* expr) {
405405
PROCESS_EXPRESSION(expr);
406406
RECURSE_EXPRESSION(Visit(expr->expression()));
407-
ZoneList<Expression*>* args = expr->arguments();
407+
ZonePtrList<Expression>* args = expr->arguments();
408408
for (int i = 0; i < args->length(); ++i) {
409409
Expression* arg = args->at(i);
410410
RECURSE_EXPRESSION(Visit(arg));
@@ -415,7 +415,7 @@ template <class Subclass>
415415
void AstTraversalVisitor<Subclass>::VisitCallNew(CallNew* expr) {
416416
PROCESS_EXPRESSION(expr);
417417
RECURSE_EXPRESSION(Visit(expr->expression()));
418-
ZoneList<Expression*>* args = expr->arguments();
418+
ZonePtrList<Expression>* args = expr->arguments();
419419
for (int i = 0; i < args->length(); ++i) {
420420
Expression* arg = args->at(i);
421421
RECURSE_EXPRESSION(Visit(arg));
@@ -425,7 +425,7 @@ void AstTraversalVisitor<Subclass>::VisitCallNew(CallNew* expr) {
425425
template <class Subclass>
426426
void AstTraversalVisitor<Subclass>::VisitCallRuntime(CallRuntime* expr) {
427427
PROCESS_EXPRESSION(expr);
428-
ZoneList<Expression*>* args = expr->arguments();
428+
ZonePtrList<Expression>* args = expr->arguments();
429429
for (int i = 0; i < args->length(); ++i) {
430430
Expression* arg = args->at(i);
431431
RECURSE_EXPRESSION(Visit(arg));
@@ -487,7 +487,7 @@ void AstTraversalVisitor<Subclass>::VisitClassLiteral(ClassLiteral* expr) {
487487
if (expr->instance_fields_initializer_function() != nullptr) {
488488
RECURSE_EXPRESSION(Visit(expr->instance_fields_initializer_function()));
489489
}
490-
ZoneList<ClassLiteralProperty*>* props = expr->properties();
490+
ZonePtrList<ClassLiteral::Property>* props = expr->properties();
491491
for (int i = 0; i < props->length(); ++i) {
492492
ClassLiteralProperty* prop = props->at(i);
493493
if (!prop->key()->IsLiteral()) {
@@ -501,7 +501,7 @@ template <class Subclass>
501501
void AstTraversalVisitor<Subclass>::VisitInitializeClassFieldsStatement(
502502
InitializeClassFieldsStatement* stmt) {
503503
PROCESS_NODE(stmt);
504-
ZoneList<ClassLiteralProperty*>* props = stmt->fields();
504+
ZonePtrList<ClassLiteral::Property>* props = stmt->fields();
505505
for (int i = 0; i < props->length(); ++i) {
506506
ClassLiteralProperty* prop = props->at(i);
507507
if (!prop->key()->IsLiteral()) {

src/ast/ast.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -856,7 +856,7 @@ Call::CallType Call::GetCallType() const {
856856
return OTHER_CALL;
857857
}
858858

859-
CaseClause::CaseClause(Expression* label, ZoneList<Statement*>* statements)
859+
CaseClause::CaseClause(Expression* label, ZonePtrList<Statement>* statements)
860860
: label_(label), statements_(statements) {}
861861

862862
bool Literal::IsPropertyName() const {
@@ -979,7 +979,7 @@ const char* CallRuntime::debug_name() {
979979
case k##NodeType: \
980980
return static_cast<const NodeType*>(this)->labels();
981981

982-
ZoneList<const AstRawString*>* BreakableStatement::labels() const {
982+
ZonePtrList<const AstRawString>* BreakableStatement::labels() const {
983983
switch (node_type()) {
984984
BREAKABLE_NODE_LIST(RETURN_LABELS)
985985
ITERATION_NODE_LIST(RETURN_LABELS)

0 commit comments

Comments
 (0)