Remove pseudo-node from LoadLocalNode and replace it with a proper AST node.

runtime/vm/flow_graph_builder.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/flow_graph_builder.h"
 
 #include "lib/invocation_mirror.h"
 #include "vm/ast_printer.h"
 #include "vm/code_descriptors.h"
 #include "vm/dart_entry.h"
@@ skipping 2629 matching lines @@
 
 
 void EffectGraphVisitor::VisitPrimaryNode(PrimaryNode* node) {
   // PrimaryNodes are temporary during parsing.
   UNREACHABLE();
 }
 
 
 // <Expression> ::= LoadLocal { local: LocalVariable }
 void EffectGraphVisitor::VisitLoadLocalNode(LoadLocalNode* node) {
-  if (node->HasPseudo()) {
-    EffectGraphVisitor for_pseudo(owner(), temp_index());
-    node->pseudo()->Visit(&for_pseudo);
-    Append(for_pseudo);
-  }
+  // Nothing to do.
 }
 
 
 void ValueGraphVisitor::VisitLoadLocalNode(LoadLocalNode* node) {
-  EffectGraphVisitor::VisitLoadLocalNode(node);
   Definition* load = BuildLoadLocal(node->local());
   ReturnDefinition(load);
 }
 
 
 // <Expression> ::= StoreLocal { local: LocalVariable
 //                               value: <Expression> }
 void EffectGraphVisitor::HandleStoreLocal(StoreLocalNode* node,
                                           bool result_is_needed) {
   ValueGraphVisitor for_value(owner(), temp_index());
@@ skipping 470 matching lines @@
   AddInstruction(
       new CatchEntryInstr(node->exception_var(), node->stacktrace_var()));
   BuildLoadContext(node->context_var());
 
   EffectGraphVisitor for_catch(owner(), temp_index());
   node->VisitChildren(&for_catch);
   Append(for_catch);
 }
 
 
+void EffectGraphVisitor::VisitCommaNode(CommaNode* node) {
+  EffectGraphVisitor for_effect_first(owner(), temp_index());

[Kevin Millikin (Google), 2013/05/28 09:13:26]

Here and below: a loop over the children if you support more than two.

+  node->first()->Visit(&for_effect_first);
+  Append(for_effect_first);
+
+  EffectGraphVisitor for_effect_second(owner(), temp_index());
+  node->second()->Visit(&for_effect_second);
+  Append(for_effect_second);
+}
+
+
+void ValueGraphVisitor::VisitCommaNode(CommaNode* node) {
+  EffectGraphVisitor for_effect(owner(), temp_index());
+  node->first()->Visit(&for_effect);
+  Append(for_effect);
+
+  ValueGraphVisitor for_value(owner(), temp_index());
+  node->second()->Visit(&for_value);
+  Append(for_value);
+  ReturnValue(for_value.value());
+}
+
+
 void EffectGraphVisitor::VisitTryCatchNode(TryCatchNode* node) {
   InlineBailout("EffectGraphVisitor::VisitTryCatchNode (exception)");
   intptr_t old_try_index = owner()->try_index();
   intptr_t try_index = owner()->AllocateTryIndex();
   owner()->set_try_index(try_index);
 
   // Preserve CTX into local variable '%saved_context'.
   BuildStoreContext(node->context_var());
 
   EffectGraphVisitor for_try_block(owner(), temp_index());
@@ skipping 281 matching lines @@
   intptr_t len = OS::SNPrint(NULL, 0, kFormat, function_name, reason) + 1;
   char* chars = Isolate::Current()->current_zone()->Alloc<char>(len);
   OS::SNPrint(chars, len, kFormat, function_name, reason);
   const Error& error = Error::Handle(
       LanguageError::New(String::Handle(String::New(chars))));
   Isolate::Current()->long_jump_base()->Jump(1, error);
 }
 
 
 }  // namespace dart