Improve code for checked instance calls (polymorphic calls) and expand printing of PolymorphicInsta…

runtime/vm/flow_graph_compiler.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_XXX.
 
 #include "vm/flow_graph_compiler.h"
 
 #include "vm/dart_entry.h"
 #include "vm/debugger.h"
@@ skipping 372 matching lines @@
   GrowableArray<intptr_t> args;
   args.Add(kArray);
   args.Add(kGrowableObjectArray);
   args.Add(kImmutableArray);
   CheckClassIds(kClassIdReg, args, is_instance_lbl, &unknown);
   assembler()->Bind(&unknown);
 }
 
 
 void FlowGraphCompiler::EmitComment(Instruction* instr) {
-  char buffer[80];
+  char buffer[255];

[regis, 2012/07/10 18:07:42]

Why not 256?

[srdjan, 2012/07/10 18:16:10]

Done.

   BufferFormatter f(buffer, sizeof(buffer));
   instr->PrintTo(&f);
   assembler()->Comment("@%d: %s", instr->cid(), buffer);
 }
 
 
 void FlowGraphCompiler::EmitLoadIndexedGeneric(LoadIndexedComp* comp) {
   const String& function_name =
       String::ZoneHandle(String::NewSymbol(Token::Str(Token::kINDEX)));
 
@@ skipping 16 matching lines @@
 
 void FlowGraphCompiler::EmitTestAndCall(const ICData& ic_data,
                                         Register class_id_reg,
                                         intptr_t arg_count,
                                         const Array& arg_names,
                                         Label* deopt,
                                         Label* done,
                                         intptr_t cid,
                                         intptr_t token_index,
                                         intptr_t try_index) {
-  // TODO(srdjan): better loop please!
+  Label match_found;
   for (intptr_t i = 0; i < ic_data.NumberOfChecks(); i++) {
+    const bool is_last_check = (i == (ic_data.NumberOfChecks() - 1));
     Label next_test;
     assembler()->cmpl(class_id_reg, Immediate(ic_data.GetReceiverClassIdAt(i)));
-    assembler()->j(NOT_EQUAL, &next_test);
+    if (is_last_check) {
+      assembler()->j(NOT_EQUAL, deopt);
+    } else {
+      assembler()->j(NOT_EQUAL, &next_test);
+    }
     const Function& target = Function::ZoneHandle(ic_data.GetTargetAt(i));
     GenerateStaticCall(cid,
                        token_index,
                        try_index,
                        target,
                        arg_count,
                        arg_names);
-    assembler()->jmp(done);
+    if (!is_last_check) {
+      assembler()->jmp(&match_found);
+    }
     assembler()->Bind(&next_test);
   }
-  assembler()->jmp(deopt);
+  assembler()->Bind(&match_found);
+  if (done != NULL) {
+    assembler()->jmp(done);
+  }
 }
 
 
 
 
 
 Register FrameRegisterAllocator::AllocateFreeRegister(bool* blocked_registers) {
   for (intptr_t regno = 0; regno < kNumberOfCpuRegisters; regno++) {
     if (!blocked_registers[regno] && (registers_[regno] == NULL)) {
       blocked_registers[regno] = true;
@@ skipping 167 matching lines @@
 
 
 void FrameRegisterAllocator::SpillInDeoptStub(DeoptimizationStub* stub) {
   for (int i = 0; i < stack_.length(); i++) {
     stub->Push(stack_[i]);
   }
 }
 
 
 }  // namespace dart