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

runtime/vm/flow_graph_compiler_x64.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/globals.h"  // Needed here to get TARGET_ARCH_X64.
 #if defined(TARGET_ARCH_X64)
 
 #include "vm/flow_graph_compiler.h"
 
 #include "vm/ast_printer.h"
@@ skipping 424 matching lines @@
 
 static const Class* CoreClass(const char* c_name) {
   const String& class_name = String::Handle(String::NewSymbol(c_name));
   const Class& cls = Class::ZoneHandle(Library::Handle(
       Library::CoreImplLibrary()).LookupClass(class_name));
   ASSERT(!cls.IsNull());
   return &cls;
 }
 
 
-void FlowGraphCompiler::GenerateInstantiatorTypeArguments(
-    intptr_t token_index) {
-  Bailout("FlowGraphCompiler::GenerateInstantiatorTypeArguments");
-}
-
-
 // Copied from CodeGenerator.
 // If instanceof type test cannot be performed successfully at compile time and
 // therefore eliminated, optimize it by adding inlined tests for:
 // - NULL -> return false.
 // - Smi -> compile time subtype check (only if dst class is not parameterized).
 // - Class equality (only if class is not parameterized).
 // Inputs:
 // - RAX: object.
+// - RDX: optional type-arguments.
 // Destroys RCX.
 // Returns:
 // - true or false in RAX.
 void FlowGraphCompiler::GenerateInstanceOf(intptr_t node_id,
                                            intptr_t token_index,
                                            intptr_t try_index,
                                            Value* value,
                                            const AbstractType& type,
                                            bool negate_result) {
   ASSERT(type.IsFinalized() && !type.IsMalformed());
@@ skipping 142 matching lines @@
   __ PushObject(Object::ZoneHandle());  // Make room for the result.
   const Immediate location =
       Immediate(reinterpret_cast<int64_t>(Smi::New(token_index)));
   const Immediate node_id_as_smi =
       Immediate(reinterpret_cast<int64_t>(Smi::New(node_id)));
   __ pushq(location);  // Push the source location.
   __ pushq(node_id_as_smi);
   __ pushq(RAX);  // Push the instance.
   __ PushObject(type);  // Push the type.
   if (!type.IsInstantiated()) {
-    GenerateInstantiatorTypeArguments(token_index);
+    __ pushq(RDX);  // Type arguments.
   } else {
     __ pushq(raw_null);  // Null instantiator.
   }
   GenerateCallRuntime(node_id, token_index, try_index, kInstanceofRuntimeEntry);
   // Pop the two parameters supplied to the runtime entry. The result of the
   // instanceof runtime call will be left as the result of the operation.
   __ addq(RSP, Immediate(5 * kWordSize));
   if (negate_result) {
     Label negate_done;
     __ popq(RDX);
     __ LoadObject(RAX, bool_true);
     __ cmpq(RDX, RAX);
     __ j(NOT_EQUAL, &negate_done, Assembler::kNearJump);
     __ LoadObject(RAX, bool_false);
     __ Bind(&negate_done);
     __ pushq(RAX);
   }
   __ Bind(&done);
   __ popq(RAX);
 }
 
 
 void FlowGraphCompiler::VisitInstanceOf(InstanceOfComp* comp) {
+  if (comp->type_arguments() != NULL) {
+    __ popq(RDX);
+  }
   __ popq(RAX);
   GenerateInstanceOf(comp->node_id(),
                      comp->token_index(),
                      comp->try_index(),
                      comp->value(),
                      comp->type(),
                      comp->negate_result());
 }
 
 
@@ skipping 282 matching lines @@
 void FlowGraphCompiler::VisitJoinEntry(JoinEntryInstr* instr) {
   __ Bind(&block_info_[instr->postorder_number()]->label);
 }
 
 
 void FlowGraphCompiler::VisitTargetEntry(TargetEntryInstr* instr) {
   __ Bind(&block_info_[instr->postorder_number()]->label);
   if (instr->HasTryIndex()) {
     exception_handlers_list_->AddHandler(instr->try_index(),
                                          assembler_->CodeSize());
-    // Bailout("Untested CatchEntry");
   }
 }
 
 
 void FlowGraphCompiler::VisitPickTemp(PickTempInstr* instr) {
   // Semantics is to copy a stack-allocated temporary to the top of stack.
   // Destination index d is assumed the new top of stack after the
   // operation, so d-1 is the current top of stack and so d-s-1 is the
   // offset to source index s.
   intptr_t offset = instr->destination() - instr->source() - 1;
@@ skipping 437 matching lines @@
   ASSERT(exception_handlers_list_ != NULL);
   const ExceptionHandlers& handlers = ExceptionHandlers::Handle(
       exception_handlers_list_->FinalizeExceptionHandlers(code.EntryPoint()));
   code.set_exception_handlers(handlers);
 }
 
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_X64