Add an explicit push-argument instruction to the IL.

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 "vm/ast_printer.h"
 #include "vm/bit_vector.h"
 #include "vm/code_descriptors.h"
 #include "vm/dart_entry.h"
@@ skipping 1357 matching lines @@
     }
     receiver = BuildNullValue();
   } else if (function.IsImplicitInstanceClosureFunction()) {
     ValueGraphVisitor for_receiver(owner(), temp_index());
     node->receiver()->Visit(&for_receiver);
     Append(for_receiver);
     receiver = for_receiver.value();
   } else {
     receiver = BuildNullValue();
   }
+  AddInstruction(new PushArgumentInstr(receiver));
   ASSERT(function.context_scope() != ContextScope::null());
 
   // The function type of a closure may have type arguments. In that case, pass
   // the type arguments of the instantiator. Otherwise, pass null object.
   const Class& cls = Class::Handle(function.signature_class());
   ASSERT(!cls.IsNull());
   const bool requires_type_arguments = cls.HasTypeArguments();
   Value* type_arguments = NULL;
   if (requires_type_arguments) {
     ASSERT(!function.IsImplicitStaticClosureFunction());
     type_arguments = BuildInstantiatorTypeArguments(node->token_pos(), NULL);
   } else {
     type_arguments = BuildNullValue();
   }
-
-  CreateClosureComp* create = new CreateClosureComp(
-      node, owner()->try_index(), type_arguments, receiver);
-  ReturnComputation(create);
+  AddInstruction(new PushArgumentInstr(type_arguments));
+  ReturnComputation(new CreateClosureComp(node, owner()->try_index()));

[Kevin Millikin (Google), 2012/07/26 13:03:18]

I imagine we'll also want a list of the push argument instructions here (e.g.,
for inlining) so we don't have to go searching for them or simulate the argument
stack.

[Florian Schneider, 2012/07/26 13:45:24]

Done.

 }
 
 
 void EffectGraphVisitor::TranslateArgumentList(
     const ArgumentListNode& node,
     ZoneGrowableArray<Value*>* values) {
   for (intptr_t i = 0; i < node.length(); ++i) {
     ValueGraphVisitor for_argument(owner(), temp_index());
     node.NodeAt(i)->Visit(&for_argument);
     Append(for_argument);
     values->Add(for_argument.value());
   }
 }
 
+
+void EffectGraphVisitor::BuildPushArguments(
+    const ArgumentListNode& node,
+    ZoneGrowableArray<PushArgumentInstr*>* values) {
+  for (intptr_t i = 0; i < node.length(); ++i) {
+    ValueGraphVisitor for_argument(owner(), temp_index());
+    node.NodeAt(i)->Visit(&for_argument);
+    Append(for_argument);
+    PushArgumentInstr* push_arg = new PushArgumentInstr(for_argument.value());
+    AddInstruction(push_arg);
+    values->Add(push_arg);
+  }
+}
+
+
 void EffectGraphVisitor::VisitInstanceCallNode(InstanceCallNode* node) {
   ArgumentListNode* arguments = node->arguments();
   int length = arguments->length();
   ZoneGrowableArray<Value*>* values = new ZoneGrowableArray<Value*>(length + 1);
 
   ValueGraphVisitor for_receiver(owner(), temp_index());
   node->receiver()->Visit(&for_receiver);
   Append(for_receiver);
   values->Add(for_receiver.value());
 
@@ skipping 20 matching lines @@
                          values);
   ReturnComputation(call);
 }
 
 
 ClosureCallComp* EffectGraphVisitor::BuildClosureCall(
     ClosureCallNode* node) {
   ValueGraphVisitor for_closure(owner(), temp_index());
   node->closure()->Visit(&for_closure);
   Append(for_closure);
+  PushArgumentInstr* push_closure = new PushArgumentInstr(for_closure.value());
+  AddInstruction(push_closure);
 
-  ZoneGrowableArray<Value*>* arguments =
-      new ZoneGrowableArray<Value*>(node->arguments()->length());
-  arguments->Add(for_closure.value());
-  TranslateArgumentList(*node->arguments(), arguments);
+  ZoneGrowableArray<PushArgumentInstr*>* arguments =
+      new ZoneGrowableArray<PushArgumentInstr*>(node->arguments()->length());
+  arguments->Add(push_closure);
+  BuildPushArguments(*node->arguments(), arguments);
 
   // Save context around the call.
   BuildStoreContext(*owner()->parsed_function().expression_temp_var());
   return new ClosureCallComp(node, owner()->try_index(), arguments);
 }
 
 
 void EffectGraphVisitor::VisitClosureCallNode(ClosureCallNode* node) {
   Do(BuildClosureCall(node));
   // Restore context from saved location.
@@ skipping 1231 matching lines @@
   char* chars = reinterpret_cast<char*>(
       Isolate::Current()->current_zone()->Allocate(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