- Add a GetClassId() to Object, so that we do not have to

runtime/vm/code_generator.cc

 // Copyright (c) 2013, 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/code_generator.h"
 
 #include "vm/assembler.h"
 #include "vm/ast.h"
 #include "vm/bigint_operations.h"
 #include "vm/code_patcher.h"
@@ skipping 875 matching lines @@
     if (FLAG_trace_ic) {
       OS::PrintErr("InlineCacheMissHandler NULL code for receiver: %s\n",
           receiver.ToCString());
     }
     return Function::null();
   }
   const Function& target_function =
       Function::Handle(target_code.function());
   ASSERT(!target_function.IsNull());
   if (args.length() == 1) {
-    ic_data.AddReceiverCheck(Class::Handle(args[0]->clazz()).id(),
+    ic_data.AddReceiverCheck(args[0]->GetClassId(),
                              target_function);
   } else {
     GrowableArray<intptr_t> class_ids(args.length());
     ASSERT(ic_data.num_args_tested() == args.length());
     for (intptr_t i = 0; i < args.length(); i++) {
-      class_ids.Add(Class::Handle(args[i]->clazz()).id());
+      class_ids.Add(args[i]->GetClassId());
     }
     ic_data.AddCheck(class_ids, target_function);
   }
   if (FLAG_trace_ic_miss_in_optimized || FLAG_trace_ic) {
     DartFrameIterator iterator;
     StackFrame* caller_frame = iterator.NextFrame();
     ASSERT(caller_frame != NULL);
     if (FLAG_trace_ic_miss_in_optimized) {
       const Code& caller = Code::Handle(Code::LookupCode(caller_frame->pc()));
       if (caller.is_optimized()) {
         OS::PrintErr("IC miss in optimized code; call %s -> %s\n",
             Function::Handle(caller.function()).ToCString(),
             target_function.ToCString());
       }
     }
     if (FLAG_trace_ic) {
       OS::PrintErr("InlineCacheMissHandler %d call at %#"Px"' "
                    "adding <%s> id:%"Pd" -> <%s>\n",
           args.length(),
           caller_frame->pc(),
           Class::Handle(receiver.clazz()).ToCString(),
-          Class::Handle(receiver.clazz()).id(),
+          receiver.GetClassId(),
           target_function.ToCString());
     }
   }
   return target_function.raw();
 }
 
 
 // Handles inline cache misses by updating the IC data array of the call
 // site.
 //   Arg0: Receiver object.
@@ skipping 146 matching lines @@
   const intptr_t kNumArguments = 2;
   const intptr_t kNumNamedArguments = 0;
   Function& target_function = Function::Handle();
   target_function = Resolver::ResolveDynamic(receiver,
                                              target_name,
                                              kNumArguments,
                                              kNumNamedArguments);
   ASSERT(!target_function.IsNull());
   GrowableArray<intptr_t> class_ids(kNumArguments);
   ASSERT(ic_data.num_args_tested() == kNumArguments);
-  class_ids.Add(Class::Handle(receiver.clazz()).id());
-  class_ids.Add(Class::Handle(arg1.clazz()).id());
+  class_ids.Add(receiver.GetClassId());
+  class_ids.Add(arg1.GetClassId());
   ic_data.AddCheck(class_ids, target_function);
 }
 
 
 // Invoke appropriate noSuchMethod function.
 // Arg0: receiver.
 // Arg1: ic-data.
 // Arg2: arguments descriptor array.
 // Arg3: arguments array.
 DEFINE_RUNTIME_ENTRY(InvokeNoSuchMethodFunction, 4) {
@@ skipping 661 matching lines @@
 
 // Update global type feedback recorded for a field recording the assignment
 // of the given value.
 //   Arg0: Field object;
 //   Arg1: Value that is being stored.
 DEFINE_RUNTIME_ENTRY(UpdateFieldCid, 2) {
   ASSERT(arguments.ArgCount() == kUpdateFieldCidRuntimeEntry.argument_count());
   const Field& field = Field::CheckedHandle(arguments.ArgAt(0));
   const Object& value = Object::Handle(arguments.ArgAt(1));
 
-  field.UpdateCid(Class::Handle(value.clazz()).id());
+  field.UpdateCid(value.GetClassId());
 }
 
 }  // namespace dart