| Index: runtime/vm/ast_transformer.cc
|
| diff --git a/runtime/vm/ast_transformer.cc b/runtime/vm/ast_transformer.cc
|
| index a137674e0f2d5ccc44721522dafce4115e8ec53a..c731c33df3d3368c7dbf191dbd112f1a213a8214 100644
|
| --- a/runtime/vm/ast_transformer.cc
|
| +++ b/runtime/vm/ast_transformer.cc
|
| @@ -44,9 +44,9 @@ namespace dart {
|
| V(While)
|
|
|
| #define DEFINE_UNREACHABLE(BaseName) \
|
| -void AwaitTransformer::Visit##BaseName##Node(BaseName##Node* node) { \
|
| - UNREACHABLE(); \
|
| -}
|
| + void AwaitTransformer::Visit##BaseName##Node(BaseName##Node* node) { \
|
| + UNREACHABLE(); \
|
| + }
|
|
|
| FOR_EACH_UNREACHABLE_NODE(DEFINE_UNREACHABLE)
|
| #undef DEFINE_UNREACHABLE
|
| @@ -76,11 +76,9 @@ LocalVariable* AwaitTransformer::EnsureCurrentTempVar() {
|
| LocalVariable* await_tmp = async_temp_scope_->LocalLookupVariable(symbol);
|
| if (await_tmp == NULL) {
|
| // We need a new temp variable; add it to the function's top scope.
|
| - await_tmp = new(Z) LocalVariable(
|
| - TokenPosition::kNoSource,
|
| - TokenPosition::kNoSource,
|
| - symbol,
|
| - Object::dynamic_type());
|
| + await_tmp = new (Z)
|
| + LocalVariable(TokenPosition::kNoSource, TokenPosition::kNoSource,
|
| + symbol, Object::dynamic_type());
|
| async_temp_scope_->AddVariable(await_tmp);
|
| // After adding it to the top scope, we can look it up from the preamble.
|
| // The following call includes an ASSERT check.
|
| @@ -103,7 +101,7 @@ LocalVariable* AwaitTransformer::AddNewTempVarToPreamble(
|
| TokenPosition token_pos) {
|
| LocalVariable* tmp_var = EnsureCurrentTempVar();
|
| ASSERT(token_pos.IsSynthetic() || token_pos.IsNoSource());
|
| - preamble_->Add(new(Z) StoreLocalNode(token_pos, tmp_var, node));
|
| + preamble_->Add(new (Z) StoreLocalNode(token_pos, tmp_var, node));
|
| NextTempVar();
|
| return tmp_var;
|
| }
|
| @@ -111,7 +109,7 @@ LocalVariable* AwaitTransformer::AddNewTempVarToPreamble(
|
|
|
| LoadLocalNode* AwaitTransformer::MakeName(AstNode* node) {
|
| LocalVariable* temp = AddNewTempVarToPreamble(node, ST(node->token_pos()));
|
| - return new(Z) LoadLocalNode(ST(node->token_pos()), temp);
|
| + return new (Z) LoadLocalNode(ST(node->token_pos()), temp);
|
| }
|
|
|
|
|
| @@ -121,7 +119,7 @@ void AwaitTransformer::VisitLiteralNode(LiteralNode* node) {
|
|
|
|
|
| void AwaitTransformer::VisitTypeNode(TypeNode* node) {
|
| - result_ = new(Z) TypeNode(node->token_pos(), node->type());
|
| + result_ = new (Z) TypeNode(node->token_pos(), node->type());
|
| }
|
|
|
|
|
| @@ -138,25 +136,25 @@ void AwaitTransformer::VisitAwaitNode(AwaitNode* node) {
|
| // :await_temp_var_(X+1) = :result_param;
|
|
|
| const TokenPosition token_pos = ST(node->token_pos());
|
| - LocalVariable* async_op = GetVariableInScope(
|
| - preamble_->scope(), Symbols::AsyncOperation());
|
| - LocalVariable* async_then_callback = GetVariableInScope(
|
| - preamble_->scope(), Symbols::AsyncThenCallback());
|
| + LocalVariable* async_op =
|
| + GetVariableInScope(preamble_->scope(), Symbols::AsyncOperation());
|
| + LocalVariable* async_then_callback =
|
| + GetVariableInScope(preamble_->scope(), Symbols::AsyncThenCallback());
|
| LocalVariable* async_catch_error_callback = GetVariableInScope(
|
| preamble_->scope(), Symbols::AsyncCatchErrorCallback());
|
| - LocalVariable* result_param = GetVariableInScope(
|
| - preamble_->scope(), Symbols::AsyncOperationParam());
|
| + LocalVariable* result_param =
|
| + GetVariableInScope(preamble_->scope(), Symbols::AsyncOperationParam());
|
| LocalVariable* error_param = GetVariableInScope(
|
| preamble_->scope(), Symbols::AsyncOperationErrorParam());
|
| LocalVariable* stack_trace_param = GetVariableInScope(
|
| preamble_->scope(), Symbols::AsyncOperationStackTraceParam());
|
|
|
| AstNode* transformed_expr = Transform(node->expr());
|
| - LocalVariable* await_temp = AddNewTempVarToPreamble(transformed_expr,
|
| - ST(node->token_pos()));
|
| + LocalVariable* await_temp =
|
| + AddNewTempVarToPreamble(transformed_expr, ST(node->token_pos()));
|
|
|
| AwaitMarkerNode* await_marker =
|
| - new(Z) AwaitMarkerNode(async_temp_scope_, node->scope(), token_pos);
|
| + new (Z) AwaitMarkerNode(async_temp_scope_, node->scope(), token_pos);
|
| preamble_->Add(await_marker);
|
|
|
| // :result_param = _awaitHelper(
|
| @@ -166,22 +164,19 @@ void AwaitTransformer::VisitAwaitNode(AwaitNode* node) {
|
| Z, async_lib.LookupFunctionAllowPrivate(Symbols::AsyncAwaitHelper()));
|
| ASSERT(!async_await_helper.IsNull());
|
| ArgumentListNode* async_await_helper_args =
|
| - new(Z) ArgumentListNode(token_pos);
|
| - async_await_helper_args->Add(
|
| - new(Z) LoadLocalNode(token_pos, await_temp));
|
| + new (Z) ArgumentListNode(token_pos);
|
| + async_await_helper_args->Add(new (Z) LoadLocalNode(token_pos, await_temp));
|
| async_await_helper_args->Add(
|
| - new(Z) LoadLocalNode(token_pos, async_then_callback));
|
| + new (Z) LoadLocalNode(token_pos, async_then_callback));
|
| async_await_helper_args->Add(
|
| - new(Z) LoadLocalNode(token_pos, async_catch_error_callback));
|
| - StaticCallNode* await_helper_call = new(Z) StaticCallNode(
|
| - node->token_pos(),
|
| - async_await_helper,
|
| - async_await_helper_args);
|
| + new (Z) LoadLocalNode(token_pos, async_catch_error_callback));
|
| + StaticCallNode* await_helper_call = new (Z) StaticCallNode(
|
| + node->token_pos(), async_await_helper, async_await_helper_args);
|
|
|
| - preamble_->Add(new(Z) StoreLocalNode(
|
| - token_pos, result_param, await_helper_call));
|
| + preamble_->Add(
|
| + new (Z) StoreLocalNode(token_pos, result_param, await_helper_call));
|
|
|
| - ReturnNode* continuation_return = new(Z) ReturnNode(token_pos);
|
| + ReturnNode* continuation_return = new (Z) ReturnNode(token_pos);
|
| continuation_return->set_return_type(ReturnNode::kContinuationTarget);
|
| preamble_->Add(continuation_return);
|
|
|
| @@ -189,17 +184,13 @@ void AwaitTransformer::VisitAwaitNode(AwaitNode* node) {
|
| // restoring the saved try context that lives on the stack and possibly the
|
| // saved try context of the outer try block.
|
| if (node->saved_try_ctx() != NULL) {
|
| - preamble_->Add(new(Z) StoreLocalNode(
|
| - token_pos,
|
| - node->saved_try_ctx(),
|
| - new(Z) LoadLocalNode(token_pos,
|
| - node->async_saved_try_ctx())));
|
| + preamble_->Add(new (Z) StoreLocalNode(
|
| + token_pos, node->saved_try_ctx(),
|
| + new (Z) LoadLocalNode(token_pos, node->async_saved_try_ctx())));
|
| if (node->outer_saved_try_ctx() != NULL) {
|
| - preamble_->Add(new(Z) StoreLocalNode(
|
| - token_pos,
|
| - node->outer_saved_try_ctx(),
|
| - new(Z) LoadLocalNode(token_pos,
|
| - node->outer_async_saved_try_ctx())));
|
| + preamble_->Add(new (Z) StoreLocalNode(
|
| + token_pos, node->outer_saved_try_ctx(),
|
| + new (Z) LoadLocalNode(token_pos, node->outer_async_saved_try_ctx())));
|
| }
|
| } else {
|
| ASSERT(node->outer_saved_try_ctx() == NULL);
|
| @@ -207,33 +198,26 @@ void AwaitTransformer::VisitAwaitNode(AwaitNode* node) {
|
|
|
| // Load the async_op variable. It is unused, but the observatory uses it
|
| // to determine if a breakpoint is inside an asynchronous function.
|
| - LoadLocalNode* load_async_op = new(Z) LoadLocalNode(token_pos, async_op);
|
| + LoadLocalNode* load_async_op = new (Z) LoadLocalNode(token_pos, async_op);
|
| preamble_->Add(load_async_op);
|
|
|
| - LoadLocalNode* load_error_param = new(Z) LoadLocalNode(
|
| - token_pos, error_param);
|
| - LoadLocalNode* load_stack_trace_param = new(Z) LoadLocalNode(
|
| - token_pos, stack_trace_param);
|
| - SequenceNode* error_ne_null_branch = new(Z) SequenceNode(
|
| - token_pos, ChainNewScope(preamble_->scope()));
|
| - error_ne_null_branch->Add(new(Z) ThrowNode(
|
| - token_pos,
|
| - load_error_param,
|
| - load_stack_trace_param));
|
| - preamble_->Add(new(Z) IfNode(
|
| - token_pos,
|
| - new(Z) ComparisonNode(
|
| - token_pos,
|
| - Token::kNE,
|
| - load_error_param,
|
| - new(Z) LiteralNode(token_pos,
|
| - Object::null_instance())),
|
| - error_ne_null_branch,
|
| - NULL));
|
| -
|
| - LocalVariable* result = AddNewTempVarToPreamble(new(Z) LoadLocalNode(
|
| - token_pos, result_param), ST(node->token_pos()));
|
| - result_ = new(Z) LoadLocalNode(token_pos, result);
|
| + LoadLocalNode* load_error_param =
|
| + new (Z) LoadLocalNode(token_pos, error_param);
|
| + LoadLocalNode* load_stack_trace_param =
|
| + new (Z) LoadLocalNode(token_pos, stack_trace_param);
|
| + SequenceNode* error_ne_null_branch =
|
| + new (Z) SequenceNode(token_pos, ChainNewScope(preamble_->scope()));
|
| + error_ne_null_branch->Add(
|
| + new (Z) ThrowNode(token_pos, load_error_param, load_stack_trace_param));
|
| + preamble_->Add(new (Z) IfNode(
|
| + token_pos, new (Z) ComparisonNode(
|
| + token_pos, Token::kNE, load_error_param,
|
| + new (Z) LiteralNode(token_pos, Object::null_instance())),
|
| + error_ne_null_branch, NULL));
|
| +
|
| + LocalVariable* result = AddNewTempVarToPreamble(
|
| + new (Z) LoadLocalNode(token_pos, result_param), ST(node->token_pos()));
|
| + result_ = new (Z) LoadLocalNode(token_pos, result);
|
| }
|
|
|
|
|
| @@ -257,31 +241,28 @@ AstNode* AwaitTransformer::LazyTransform(const Token::Kind logical_op,
|
| AstNode* right) {
|
| ASSERT(logical_op == Token::kAND || logical_op == Token::kOR);
|
| AstNode* result = NULL;
|
| - const Token::Kind compare_logical_op = (logical_op == Token::kAND) ?
|
| - Token::kEQ : Token::kNE;
|
| - SequenceNode* eval = new(Z) SequenceNode(
|
| - ST(new_left->token_pos()), ChainNewScope(preamble_->scope()));
|
| + const Token::Kind compare_logical_op =
|
| + (logical_op == Token::kAND) ? Token::kEQ : Token::kNE;
|
| + SequenceNode* eval = new (Z) SequenceNode(ST(new_left->token_pos()),
|
| + ChainNewScope(preamble_->scope()));
|
| SequenceNode* saved_preamble = preamble_;
|
| preamble_ = eval;
|
| result = Transform(right);
|
| preamble_ = saved_preamble;
|
| - IfNode* right_body = new(Z) IfNode(
|
| - ST(new_left->token_pos()),
|
| - new(Z) ComparisonNode(
|
| - ST(new_left->token_pos()),
|
| - compare_logical_op,
|
| - new_left,
|
| - new(Z) LiteralNode(ST(new_left->token_pos()), Bool::True())),
|
| - eval,
|
| - NULL);
|
| + IfNode* right_body = new (Z)
|
| + IfNode(ST(new_left->token_pos()),
|
| + new (Z) ComparisonNode(
|
| + ST(new_left->token_pos()), compare_logical_op, new_left,
|
| + new (Z) LiteralNode(ST(new_left->token_pos()), Bool::True())),
|
| + eval, NULL);
|
| preamble_->Add(right_body);
|
| return result;
|
| }
|
|
|
|
|
| LocalScope* AwaitTransformer::ChainNewScope(LocalScope* parent) {
|
| - return new(Z) LocalScope(
|
| - parent, parent->function_level(), parent->loop_level());
|
| + return new (Z)
|
| + LocalScope(parent, parent->function_level(), parent->loop_level());
|
| }
|
|
|
|
|
| @@ -294,28 +275,23 @@ void AwaitTransformer::VisitBinaryOpNode(BinaryOpNode* node) {
|
| } else {
|
| new_right = Transform(node->right());
|
| }
|
| - result_ = MakeName(new(Z) BinaryOpNode(node->token_pos(),
|
| - node->kind(),
|
| - new_left,
|
| - new_right));
|
| + result_ = MakeName(new (Z) BinaryOpNode(node->token_pos(), node->kind(),
|
| + new_left, new_right));
|
| }
|
|
|
|
|
| void AwaitTransformer::VisitComparisonNode(ComparisonNode* node) {
|
| AstNode* new_left = Transform(node->left());
|
| AstNode* new_right = Transform(node->right());
|
| - result_ = MakeName(new(Z) ComparisonNode(node->token_pos(),
|
| - node->kind(),
|
| - new_left,
|
| - new_right));
|
| + result_ = MakeName(new (Z) ComparisonNode(node->token_pos(), node->kind(),
|
| + new_left, new_right));
|
| }
|
|
|
|
|
| void AwaitTransformer::VisitUnaryOpNode(UnaryOpNode* node) {
|
| AstNode* new_operand = Transform(node->operand());
|
| - result_ = MakeName(new(Z) UnaryOpNode(node->token_pos(),
|
| - node->kind(),
|
| - new_operand));
|
| + result_ = MakeName(
|
| + new (Z) UnaryOpNode(node->token_pos(), node->kind(), new_operand));
|
| }
|
|
|
|
|
| @@ -323,30 +299,26 @@ void AwaitTransformer::VisitUnaryOpNode(UnaryOpNode* node) {
|
| //
|
| void AwaitTransformer::VisitConditionalExprNode(ConditionalExprNode* node) {
|
| AstNode* new_condition = Transform(node->condition());
|
| - SequenceNode* new_true = new(Z) SequenceNode(
|
| + SequenceNode* new_true = new (Z) SequenceNode(
|
| ST(node->true_expr()->token_pos()), ChainNewScope(preamble_->scope()));
|
| SequenceNode* saved_preamble = preamble_;
|
| preamble_ = new_true;
|
| AstNode* new_true_result = Transform(node->true_expr());
|
| - SequenceNode* new_false = new(Z) SequenceNode(
|
| + SequenceNode* new_false = new (Z) SequenceNode(
|
| ST(node->false_expr()->token_pos()), ChainNewScope(preamble_->scope()));
|
| preamble_ = new_false;
|
| AstNode* new_false_result = Transform(node->false_expr());
|
| preamble_ = saved_preamble;
|
| - IfNode* new_if = new(Z) IfNode(ST(node->token_pos()),
|
| - new_condition,
|
| - new_true,
|
| - new_false);
|
| + IfNode* new_if =
|
| + new (Z) IfNode(ST(node->token_pos()), new_condition, new_true, new_false);
|
| preamble_->Add(new_if);
|
| - result_ = MakeName(new(Z) ConditionalExprNode(ST(node->token_pos()),
|
| - new_condition,
|
| - new_true_result,
|
| - new_false_result));
|
| + result_ = MakeName(new (Z) ConditionalExprNode(
|
| + ST(node->token_pos()), new_condition, new_true_result, new_false_result));
|
| }
|
|
|
|
|
| void AwaitTransformer::VisitArgumentListNode(ArgumentListNode* node) {
|
| - ArgumentListNode* new_args = new(Z) ArgumentListNode(node->token_pos());
|
| + ArgumentListNode* new_args = new (Z) ArgumentListNode(node->token_pos());
|
| for (intptr_t i = 0; i < node->length(); i++) {
|
| new_args->Add(Transform(node->NodeAt(i)));
|
| }
|
| @@ -360,14 +332,14 @@ void AwaitTransformer::VisitArrayNode(ArrayNode* node) {
|
| for (intptr_t i = 0; i < node->length(); i++) {
|
| new_elements.Add(Transform(node->ElementAt(i)));
|
| }
|
| - result_ = new(Z) ArrayNode(node->token_pos(), node->type(), new_elements);
|
| + result_ = new (Z) ArrayNode(node->token_pos(), node->type(), new_elements);
|
| }
|
|
|
|
|
| void AwaitTransformer::VisitStringInterpolateNode(StringInterpolateNode* node) {
|
| ArrayNode* new_value = Transform(node->value())->AsArrayNode();
|
| - result_ = MakeName(new(Z) StringInterpolateNode(node->token_pos(),
|
| - new_value));
|
| + result_ =
|
| + MakeName(new (Z) StringInterpolateNode(node->token_pos(), new_value));
|
| }
|
|
|
|
|
| @@ -376,10 +348,8 @@ void AwaitTransformer::VisitClosureNode(ClosureNode* node) {
|
| if (new_receiver != NULL) {
|
| new_receiver = Transform(new_receiver);
|
| }
|
| - result_ = MakeName(new(Z) ClosureNode(node->token_pos(),
|
| - node->function(),
|
| - new_receiver,
|
| - node->scope()));
|
| + result_ = MakeName(new (Z) ClosureNode(node->token_pos(), node->function(),
|
| + new_receiver, node->scope()));
|
| }
|
|
|
|
|
| @@ -387,39 +357,34 @@ void AwaitTransformer::VisitInstanceCallNode(InstanceCallNode* node) {
|
| AstNode* new_receiver = Transform(node->receiver());
|
| ArgumentListNode* new_args =
|
| Transform(node->arguments())->AsArgumentListNode();
|
| - result_ = MakeName(new(Z) InstanceCallNode(node->token_pos(),
|
| - new_receiver,
|
| - node->function_name(),
|
| - new_args,
|
| - node->is_conditional()));
|
| + result_ = MakeName(new (Z) InstanceCallNode(node->token_pos(), new_receiver,
|
| + node->function_name(), new_args,
|
| + node->is_conditional()));
|
| }
|
|
|
|
|
| void AwaitTransformer::VisitStaticCallNode(StaticCallNode* node) {
|
| ArgumentListNode* new_args =
|
| Transform(node->arguments())->AsArgumentListNode();
|
| - result_ = MakeName(new(Z) StaticCallNode(node->token_pos(),
|
| - node->function(),
|
| - new_args));
|
| + result_ = MakeName(
|
| + new (Z) StaticCallNode(node->token_pos(), node->function(), new_args));
|
| }
|
|
|
|
|
| void AwaitTransformer::VisitConstructorCallNode(ConstructorCallNode* node) {
|
| ArgumentListNode* new_args =
|
| Transform(node->arguments())->AsArgumentListNode();
|
| - result_ = MakeName(new(Z) ConstructorCallNode(node->token_pos(),
|
| - node->type_arguments(),
|
| - node->constructor(),
|
| - new_args));
|
| + result_ = MakeName(
|
| + new (Z) ConstructorCallNode(node->token_pos(), node->type_arguments(),
|
| + node->constructor(), new_args));
|
| }
|
|
|
|
|
| void AwaitTransformer::VisitInstanceGetterNode(InstanceGetterNode* node) {
|
| AstNode* new_receiver = Transform(node->receiver());
|
| - result_ = MakeName(new(Z) InstanceGetterNode(node->token_pos(),
|
| - new_receiver,
|
| - node->field_name(),
|
| - node->is_conditional()));
|
| + result_ = MakeName(new (Z) InstanceGetterNode(node->token_pos(), new_receiver,
|
| + node->field_name(),
|
| + node->is_conditional()));
|
| }
|
|
|
|
|
| @@ -429,11 +394,9 @@ void AwaitTransformer::VisitInstanceSetterNode(InstanceSetterNode* node) {
|
| new_receiver = Transform(new_receiver);
|
| }
|
| AstNode* new_value = Transform(node->value());
|
| - result_ = MakeName(new(Z) InstanceSetterNode(node->token_pos(),
|
| - new_receiver,
|
| - node->field_name(),
|
| - new_value,
|
| - node->is_conditional()));
|
| + result_ = MakeName(new (Z) InstanceSetterNode(node->token_pos(), new_receiver,
|
| + node->field_name(), new_value,
|
| + node->is_conditional()));
|
| }
|
|
|
|
|
| @@ -442,11 +405,8 @@ void AwaitTransformer::VisitStaticGetterNode(StaticGetterNode* node) {
|
| if (new_receiver != NULL) {
|
| new_receiver = Transform(new_receiver);
|
| }
|
| - StaticGetterNode* new_getter =
|
| - new(Z) StaticGetterNode(node->token_pos(),
|
| - new_receiver,
|
| - node->cls(),
|
| - node->field_name());
|
| + StaticGetterNode* new_getter = new (Z) StaticGetterNode(
|
| + node->token_pos(), new_receiver, node->cls(), node->field_name());
|
| new_getter->set_owner(node->owner());
|
| result_ = MakeName(new_getter);
|
| }
|
| @@ -460,16 +420,11 @@ void AwaitTransformer::VisitStaticSetterNode(StaticSetterNode* node) {
|
| AstNode* new_value = Transform(node->value());
|
| StaticSetterNode* new_setter =
|
| node->function().IsNull()
|
| - ? new(Z) StaticSetterNode(node->token_pos(),
|
| - new_receiver,
|
| - node->cls(),
|
| - node->field_name(),
|
| - new_value)
|
| - : new(Z) StaticSetterNode(node->token_pos(),
|
| - new_receiver,
|
| - node->field_name(),
|
| - node->function(),
|
| - new_value);
|
| + ? new (Z) StaticSetterNode(node->token_pos(), new_receiver,
|
| + node->cls(), node->field_name(), new_value)
|
| + : new (Z) StaticSetterNode(node->token_pos(), new_receiver,
|
| + node->field_name(), node->function(),
|
| + new_value);
|
|
|
| result_ = MakeName(new_setter);
|
| }
|
| @@ -482,9 +437,8 @@ void AwaitTransformer::VisitLoadLocalNode(LoadLocalNode* node) {
|
|
|
| void AwaitTransformer::VisitStoreLocalNode(StoreLocalNode* node) {
|
| AstNode* new_value = Transform(node->value());
|
| - result_ = MakeName(new(Z) StoreLocalNode(node->token_pos(),
|
| - &node->local(),
|
| - new_value));
|
| + result_ = MakeName(
|
| + new (Z) StoreLocalNode(node->token_pos(), &node->local(), new_value));
|
| }
|
|
|
|
|
| @@ -495,8 +449,8 @@ void AwaitTransformer::VisitLoadStaticFieldNode(LoadStaticFieldNode* node) {
|
|
|
| void AwaitTransformer::VisitStoreStaticFieldNode(StoreStaticFieldNode* node) {
|
| AstNode* new_value = Transform(node->value());
|
| - result_ = MakeName(new(Z) StoreStaticFieldNode(node->token_pos(),
|
| - Field::ZoneHandle(Z, node->field().Original()),
|
| + result_ = MakeName(new (Z) StoreStaticFieldNode(
|
| + node->token_pos(), Field::ZoneHandle(Z, node->field().Original()),
|
| new_value));
|
| }
|
|
|
| @@ -504,10 +458,8 @@ void AwaitTransformer::VisitStoreStaticFieldNode(StoreStaticFieldNode* node) {
|
| void AwaitTransformer::VisitLoadIndexedNode(LoadIndexedNode* node) {
|
| AstNode* new_array = Transform(node->array());
|
| AstNode* new_index = Transform(node->index_expr());
|
| - result_ = MakeName(new(Z) LoadIndexedNode(node->token_pos(),
|
| - new_array,
|
| - new_index,
|
| - node->super_class()));
|
| + result_ = MakeName(new (Z) LoadIndexedNode(node->token_pos(), new_array,
|
| + new_index, node->super_class()));
|
| }
|
|
|
|
|
| @@ -515,20 +467,15 @@ void AwaitTransformer::VisitStoreIndexedNode(StoreIndexedNode* node) {
|
| AstNode* new_array = Transform(node->array());
|
| AstNode* new_index = Transform(node->index_expr());
|
| AstNode* new_value = Transform(node->value());
|
| - result_ = MakeName(new(Z) StoreIndexedNode(node->token_pos(),
|
| - new_array,
|
| - new_index,
|
| - new_value,
|
| - node->super_class()));
|
| + result_ = MakeName(new (Z) StoreIndexedNode(
|
| + node->token_pos(), new_array, new_index, new_value, node->super_class()));
|
| }
|
|
|
|
|
| void AwaitTransformer::VisitAssignableNode(AssignableNode* node) {
|
| AstNode* new_expr = Transform(node->expr());
|
| - result_ = MakeName(new(Z) AssignableNode(node->token_pos(),
|
| - new_expr,
|
| - node->type(),
|
| - node->dst_name()));
|
| + result_ = MakeName(new (Z) AssignableNode(node->token_pos(), new_expr,
|
| + node->type(), node->dst_name()));
|
| }
|
|
|
|
|
| @@ -541,9 +488,8 @@ void AwaitTransformer::VisitLetNode(LetNode* node) {
|
| for (intptr_t i = 0; i < node->num_temps(); i++) {
|
| async_temp_scope_->AddVariable(node->TempAt(i));
|
| AstNode* new_init_val = Transform(node->InitializerAt(i));
|
| - preamble_->Add(new(Z) StoreLocalNode(node->token_pos(),
|
| - node->TempAt(i),
|
| - new_init_val));
|
| + preamble_->Add(new (Z) StoreLocalNode(node->token_pos(), node->TempAt(i),
|
| + new_init_val));
|
| }
|
|
|
| // Add all expressions but the last to the preamble. We must do
|
| @@ -565,9 +511,8 @@ void AwaitTransformer::VisitLetNode(LetNode* node) {
|
|
|
| void AwaitTransformer::VisitThrowNode(ThrowNode* node) {
|
| AstNode* new_exception = Transform(node->exception());
|
| - result_ = MakeName(new(Z) ThrowNode(node->token_pos(),
|
| - new_exception,
|
| - node->stacktrace()));
|
| + result_ = MakeName(
|
| + new (Z) ThrowNode(node->token_pos(), new_exception, node->stacktrace()));
|
| }
|
|
|
| } // namespace dart
|
|
|