More ICData cleanups: try to use ICData instead of converting it to another intermediate representa…

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 "lib/error.h"
@@ skipping 1004 matching lines @@
                                             intptr_t try_index,
                                             const RuntimeEntry& entry) {
   ASSERT(frame_register_allocator()->IsSpilled());
   __ CallRuntime(entry);
   AddCurrentDescriptor(PcDescriptors::kOther, cid, token_index, try_index);
 }
 
 
 // Checks class id of instance against all 'class_ids'. Jump to 'deopt' label
 // if no match or instance is Smi.
-void FlowGraphCompiler::EmitClassChecksNoSmi(
-    const ZoneGrowableArray<intptr_t>& class_ids,
-    Register instance_reg,
-    Register temp_reg,
-    Label* deopt) {
+void FlowGraphCompiler::EmitClassChecksNoSmi(const ICData& ic_data,
+                                             Register instance_reg,
+                                             Register temp_reg,
+                                             Label* deopt) {
   Label ok;
-  ASSERT(class_ids[0] != kSmi);
+  ASSERT(ic_data.GetReceiverClassIdAt(0) != kSmi);
   __ testq(instance_reg, Immediate(kSmiTagMask));
   __ j(ZERO, deopt);
   Label is_ok;
-  bool use_near_jump = class_ids.length() < 5;
+  const intptr_t num_checks = ic_data.NumberOfChecks();
+  const bool use_near_jump = num_checks < 5;
   __ LoadClassId(temp_reg, instance_reg);
-  for (intptr_t i = 0; i < class_ids.length(); i++) {
-    __ cmpl(temp_reg, Immediate(class_ids[i]));
-    if (i == (class_ids.length() - 1)) {
+  for (intptr_t i = 0; i < num_checks; i++) {
+    __ cmpl(temp_reg, Immediate(ic_data.GetReceiverClassIdAt(i)));
+    if (i == (num_checks - 1)) {
       __ j(NOT_EQUAL, deopt);
     } else {
       if (use_near_jump) {

[regis, 2012/06/19 21:14:18]

Since Assembler::kNearJump is bool true, you could simply pass use_near_jump to
j().
Or maybe cleaner, pass num_checks < 5 ? Assembler::kNearJump
:Assembler::kFarJump.
Leaving it as is is fine too. 

[srdjan, 2012/06/19 21:28:17]

Leaving it as it is.

         __ j(EQUAL, &is_ok, Assembler::kNearJump);
       } else {
         __ j(EQUAL, &is_ok);
       }
     }
   }
   __ Bind(&is_ok);
 }
 
 
@@ skipping 14 matching lines @@
   __ cvtsi2sd(result, temp);
   __ Bind(&done);
 }
 
 
 #undef __
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_X64