Implement StaticCall and InstanceCall in the new code generator.

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 "vm/flags.h"
 #include "vm/intermediate_language.h"
 #include "vm/longjump.h"
 #include "vm/os.h"
@@ skipping 111 matching lines @@
 
 void TestGraphVisitor::BranchOnValue(Value* value) {
   BranchInstr* branch = new BranchInstr(value);
   AddInstruction(branch);
   CloseFragment();
   true_successor_address_ = branch->true_successor_address();
   false_successor_address_ = branch->false_successor_address();
 }
 
 
+void ArgumentGraphVisitor::ReturnValue(Value* value) {
+  value_ = value;
+  if (value->IsConstant()) {
+    AddInstruction(new BindInstr(temp_index(), value));
+    value_ = new TempVal(AllocateTempIndex());
+  }
+}
+
+
 void EffectGraphVisitor::Bailout(const char* reason) {
   owner()->Bailout(reason);
 }
 
 
 // 'bailout' is a statement (without a semicolon), typically a return.
 #define CHECK_ALIVE(bailout)                            \
   do {                                                  \
     if (!is_open()) {                                   \
       bailout;                                          \
@@ skipping 73 matching lines @@
 
 // <Expression> :: BinaryOp { kind:  Token::Kind
 //                            left:  <Expression>
 //                            right: <Expression> }
 void EffectGraphVisitor::VisitBinaryOpNode(BinaryOpNode* node) {
   // Operators "&&" and "||" cannot be overloaded therefore do not call
   // operator.
   if ((node->kind() == Token::kAND) || (node->kind() == Token::kOR)) {
     Bailout("EffectGraphVisitor::VisitBinaryOpNode AND/OR");
   }
-  ValueGraphVisitor for_left_value(owner(), temp_index());
+  ArgumentGraphVisitor for_left_value(owner(), temp_index());
   node->left()->Visit(&for_left_value);
   Append(for_left_value);
-  CHECK_ALIVE(return);
-  ValueGraphVisitor for_right_value(owner(), for_left_value.temp_index());
+  ArgumentGraphVisitor for_right_value(owner(), for_left_value.temp_index());
   node->right()->Visit(&for_right_value);
   Append(for_right_value);
-  CHECK_ALIVE(return);
   ZoneGrowableArray<Value*>* arguments = new ZoneGrowableArray<Value*>(2);
   arguments->Add(for_left_value.value());
   arguments->Add(for_right_value.value());
-  InstanceCallComp* call = new InstanceCallComp(node->Name(), arguments);
+  const String& name = String::ZoneHandle(String::NewSymbol(node->Name()));
+  InstanceCallComp* call =
+      new InstanceCallComp(node, name, arguments, Array::ZoneHandle(), 2);
   ReturnComputation(call);
 }
 
 
 void EffectGraphVisitor::VisitStringConcatNode(StringConcatNode* node) {
   Bailout("EffectGraphVisitor::VisitStringConcatNode");
 }
 
 
 // <Expression> :: Comparison { kind:  Token::Kind
 //                              left:  <Expression>
 //                              right: <Expression> }
 void EffectGraphVisitor::VisitComparisonNode(ComparisonNode* node) {
   if (Token::IsInstanceofOperator(node->kind())) {
     Bailout("instanceof not yet implemented");
   } else if ((node->kind() == Token::kEQ) || (node->kind() == Token::kNE)) {
     Bailout("'==' or '!=' comparison not yet implemented");
   }
-  ValueGraphVisitor for_left_value(owner(), temp_index());
-  node->left()->Visit(&for_left_value);
-  Append(for_left_value);
-  CHECK_ALIVE(return);
-  ValueGraphVisitor for_right_value(owner(), for_left_value.temp_index());
-  node->right()->Visit(&for_right_value);
-  Append(for_right_value);
-  CHECK_ALIVE(return);
+
   if ((node->kind() == Token::kEQ_STRICT) ||
       (node->kind() == Token::kNE_STRICT)) {
+    ValueGraphVisitor for_left_value(owner(), temp_index());
+    node->left()->Visit(&for_left_value);
+    Append(for_left_value);
+    ValueGraphVisitor for_right_value(owner(), for_left_value.temp_index());
+    node->right()->Visit(&for_right_value);
+    Append(for_right_value);

[srdjan, 2012/03/01 17:16:56]

Why don't you materialize the constants for strict equality check as well? You
could share the ArgumentGraphVisitor between both cases as it was similar with
ValueGraphVisitor before.

     StrictCompareComp* comp = new StrictCompareComp(
         node->kind(), for_left_value.value(), for_right_value.value());
     ReturnComputation(comp);
     return;
   }
+
+  ArgumentGraphVisitor for_left_value(owner(), temp_index());
+  node->left()->Visit(&for_left_value);
+  Append(for_left_value);
+  ArgumentGraphVisitor for_right_value(owner(), for_left_value.temp_index());
+  node->right()->Visit(&for_right_value);
+  Append(for_right_value);
   ZoneGrowableArray<Value*>* arguments = new ZoneGrowableArray<Value*>(2);
   arguments->Add(for_left_value.value());
   arguments->Add(for_right_value.value());
-  InstanceCallComp* call = new InstanceCallComp(node->Name(), arguments);
+  const String& name = String::ZoneHandle(String::NewSymbol(node->Name()));
+  InstanceCallComp* call =
+      new InstanceCallComp(node, name, arguments, Array::ZoneHandle(), 2);
   ReturnComputation(call);
 }
 
 
 void EffectGraphVisitor::VisitUnaryOpNode(UnaryOpNode* node) {
   // "!" cannot be overloaded, therefore do not call operator.
   if (node->kind() == Token::kNOT) {
     Bailout("EffectGraphVisitor::VisitUnaryOpNode NOT");
   }
-  ValueGraphVisitor for_value(owner(), temp_index());
+  ArgumentGraphVisitor for_value(owner(), temp_index());
   node->operand()->Visit(&for_value);
   Append(for_value);
-  ZoneGrowableArray<Value*>* argument = new ZoneGrowableArray<Value*>(1);
-  argument->Add(for_value.value());
-  InstanceCallComp* call = new InstanceCallComp(node->Name(), argument);
+  ZoneGrowableArray<Value*>* arguments = new ZoneGrowableArray<Value*>(1);
+  arguments->Add(for_value.value());
+  const String& name =
+      String::ZoneHandle(String::NewSymbol((node->kind() == Token::kSUB)
+                                               ? Token::Str(Token::kNEGATE)
+                                               : node->Name()));
+  InstanceCallComp* call =
+      new InstanceCallComp(node, name, arguments, Array::ZoneHandle(), 1);
   ReturnComputation(call);
 }
 
 
 void EffectGraphVisitor::VisitIncrOpLocalNode(IncrOpLocalNode* node) {
   Bailout("EffectGraphVisitor::VisitIncrOpLocalNode");
 }
 
 
 void EffectGraphVisitor::VisitIncrOpInstanceFieldNode(
@@ skipping 84 matching lines @@
 void EffectGraphVisitor::VisitArrayNode(ArrayNode* node) {
   Bailout("EffectGraphVisitor::VisitArrayNode");
 }
 
 
 void EffectGraphVisitor::VisitClosureNode(ClosureNode* node) {
   Bailout("EffectGraphVisitor::VisitClosureNode");
 }
 
 
+void EffectGraphVisitor::TranslateArgumentList(
+    const ArgumentListNode& node,
+    intptr_t next_temp_index,
+    ZoneGrowableArray<Value*>* values) {
+  for (intptr_t i = 0; i < node.length(); ++i) {
+    ArgumentGraphVisitor for_argument(owner(), next_temp_index);
+    node.NodeAt(i)->Visit(&for_argument);
+    Append(for_argument);
+    next_temp_index = for_argument.temp_index();
+    values->Add(for_argument.value());
+  }
+}
+
 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());
+  ArgumentGraphVisitor for_receiver(owner(), temp_index());
   node->receiver()->Visit(&for_receiver);
   Append(for_receiver);
-  CHECK_ALIVE(return);
-  Value* receiver_value = for_receiver.value();
-  temp_index_ = for_receiver.temp_index();
-  if (receiver_value->IsConstant()) {
-    AddInstruction(new BindInstr(temp_index(), receiver_value));
-    receiver_value = new TempVal(AllocateTempIndex());
-  }
-  values->Add(receiver_value);
+  values->Add(for_receiver.value());
 
-  TranslateArgumentList(*arguments, values);
-  CHECK_ALIVE(return);
+  TranslateArgumentList(*arguments, for_receiver.temp_index(), values);
   InstanceCallComp* call =
-      new InstanceCallComp(node->function_name().ToCString(), values);
+      new InstanceCallComp(node, node->function_name(), values,
+                           arguments->names(), 1);
   ReturnComputation(call);
 }
 
 
-void EffectGraphVisitor::TranslateArgumentList(
-    const ArgumentListNode& node, ZoneGrowableArray<Value*>* values) {
-  int index = temp_index();
-  for (intptr_t i = 0; i < node.length(); ++i) {
-    ValueGraphVisitor for_value(owner(), index);
-    node.NodeAt(i)->Visit(&for_value);
-    Append(for_value);
-    CHECK_ALIVE(return);
-    Value* argument_value = for_value.value();
-    index = for_value.temp_index();
-    if (argument_value->IsConstant()) {
-      AddInstruction(new BindInstr(index, argument_value));
-      argument_value = new TempVal(index++);
-    }
-    values->Add(argument_value);
-  }
-}
-
 // <Expression> ::= StaticCall { function: Function
 //                               arguments: <ArgumentList> }
 void EffectGraphVisitor::VisitStaticCallNode(StaticCallNode* node) {
   int length = node->arguments()->length();
   ZoneGrowableArray<Value*>* values = new ZoneGrowableArray<Value*>(length);
-  TranslateArgumentList(*node->arguments(), values);
-  CHECK_ALIVE(return);
-  StaticCallComp* call = new StaticCallComp(node->function(), values);
+  TranslateArgumentList(*node->arguments(), temp_index(), values);
+  StaticCallComp* call = new StaticCallComp(node, values);
   ReturnComputation(call);
 }
 
 
 void EffectGraphVisitor::VisitClosureCallNode(ClosureCallNode* node) {
   Bailout("EffectGraphVisitor::VisitClosureCallNode");
 }
 
 
 void EffectGraphVisitor::VisitCloneContextNode(CloneContextNode* node) {
@@ skipping 199 matching lines @@
 
 
 void FlowGraphPrinter::VisitAssertAssignable(AssertAssignableComp* comp) {
   OS::Print("AssertAssignable(");
   comp->value()->Accept(this);
   OS::Print(", %s)", comp->type().ToCString());
 }
 
 
 void FlowGraphPrinter::VisitInstanceCall(InstanceCallComp* comp) {
-  OS::Print("InstanceCall(%s", comp->name());
+  OS::Print("InstanceCall(%s", comp->function_name().ToCString());
   for (int i = 0; i < comp->ArgumentCount(); ++i) {
     OS::Print(", ");
     comp->ArgumentAt(i)->Accept(this);
   }
   OS::Print(")");
 }
 
 
 void FlowGraphPrinter::VisitStrictCompare(StrictCompareComp* comp) {
   OS::Print("StrictCompare(%s, ", Token::Str(comp->kind()));
@@ skipping 91 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