Use kInstanceCid instead of object_store()->object_class() when checking to see if the class is obj…

vm/resolver.cc

 // Copyright (c) 2011, 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/resolver.h"
 
 #include "vm/flags.h"
 #include "vm/isolate.h"
 #include "vm/object.h"
 #include "vm/object_store.h"
 
 namespace dart {
 
 DEFINE_FLAG(bool, trace_resolving, false, "Trace resolving.");
 
 
 // The actual names of named arguments are not checked by the dynamic resolver,
 // but by the method entry code. It is important that the dynamic resolver
 // checks that no named arguments are passed to a method that does not accept
 // them, since the entry code of such a method does not check for named
 // arguments. The dynamic resolver actually checks that a valid number of named
 // arguments is passed in.
 RawFunction* Resolver::ResolveDynamic(const Instance& receiver,
                                       const String& function_name,
                                       int num_arguments,
                                       int num_named_arguments) {
   // Figure out type of receiver first.
   Class& cls = Class::Handle();
-  if (receiver.IsNull()) {
-    // For method lookup treat null object as instance of Object.
-    // TODO(srdjan): Remove special case once Dart's NullClass is implemented.
+  cls = receiver.clazz();
+  // For lookups treat null as an instance of class Object.
+  if (cls.IsNullClass()) {
     cls = Isolate::Current()->object_store()->object_class();
-  } else {
-    cls = receiver.clazz();
   }
   ASSERT(!cls.IsNull());
 
   return ResolveDynamicForReceiverClass(
       cls, function_name, num_arguments, num_named_arguments);
 }
 
 
 RawFunction* Resolver::ResolveDynamicForReceiverClass(
     const Class& receiver_class,
@@ skipping 149 matching lines @@
       OS::Print("ResolveStatic error '%s': %s.\n",
                 function_name.ToCString(),
                 error_message.ToCString());
     }
     return Function::null();
   }
   return function.raw();
 }
 
 }  // namespace dart