Eliminated last bailout (except for type checked mode) in the new compiler: generate type arguments…

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/ast_printer.h"
 #include "vm/code_descriptors.h"
 #include "vm/dart_entry.h"
 #include "vm/flags.h"
@@ skipping 408 matching lines @@
   StaticCallComp* call =
       new StaticCallComp(node->token_index(),
                          owner()->try_index(),
                          interpol_func,
                          interpol_arg->names(),
                          values);
   ReturnComputation(call);
 }
 
 
+void EffectGraphVisitor::BuildInstanceOf(ComparisonNode* node) {
+  ASSERT(Token::IsInstanceofOperator(node->kind()));
+  ArgumentGraphVisitor for_left_value(owner(), temp_index());
+  node->left()->Visit(&for_left_value);
+  Append(for_left_value);
+  const AbstractType& type = node->right()->AsTypeNode()->type();
+  ASSERT(type.IsFinalized() && !type.IsMalformed());
+  Value* type_arguments = NULL;
+  if (!type.IsInstantiated()) {
+    type_arguments = BuildInstantiatorTypeArguments(
+        node->token_index(), for_left_value.temp_index());
+  }
+  InstanceOfComp* instance_of = new InstanceOfComp(
+      node->id(),
+      node->token_index(),
+      owner()->try_index(),
+      for_left_value.value(),
+      type_arguments,
+      node->right()->AsTypeNode()->type(),
+      (node->kind() == Token::kISNOT));
+  ReturnComputation(instance_of);
+}
+
+
 // <Expression> :: Comparison { kind:  Token::Kind
 //                              left:  <Expression>
 //                              right: <Expression> }
 void EffectGraphVisitor::VisitComparisonNode(ComparisonNode* node) {
   if (Token::IsInstanceofOperator(node->kind())) {
-    ArgumentGraphVisitor for_left_value(owner(), temp_index());
-    node->left()->Visit(&for_left_value);
-    Append(for_left_value);
-    InstanceOfComp* instance_of = new InstanceOfComp(
-        node->id(),
-        node->token_index(),
-        owner()->try_index(),
-        for_left_value.value(),
-        node->right()->AsTypeNode()->type(),
-        (node->kind() == Token::kISNOT));
-    ReturnComputation(instance_of);
+    BuildInstanceOf(node);
     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);
@@ skipping 1765 matching lines @@
   OS::Print("! ");
   comp->value()->Accept(this);
 }
 
 
 void FlowGraphPrinter::VisitInstanceOf(InstanceOfComp* comp) {
   comp->value()->Accept(this);
   OS::Print(" %s %s",
       comp->negate_result() ? "ISNOT" : "IS",
       String::Handle(comp->type().Name()).ToCString());
+  if (comp->type_arguments() != NULL) {
+    OS::Print(" (type-arg:");
+    comp->type_arguments()->Accept(this);
+    OS::Print(")");
+  }
 }
 
 
 void FlowGraphPrinter::VisitAllocateObject(AllocateObjectComp* comp) {
   OS::Print("AllocateObject(%s",
       Class::Handle(comp->constructor().owner()).ToCString());
   for (intptr_t i = 0; i < comp->arguments().length(); i++) {
     OS::Print(", ");
     comp->arguments()[i]->Accept(this);
   }
@@ skipping 289 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