- Register canonical names for internal VM classes and get rid of the method GetSingletonClassName

vm/object_test.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 "platform/assert.h"
 #include "vm/assembler.h"
 #include "vm/bigint_operations.h"
 #include "vm/isolate.h"
 #include "vm/object.h"
 #include "vm/object_store.h"
 #include "vm/symbols.h"
 #include "vm/unit_test.h"
 
 namespace dart {
 
 TEST_CASE(Class) {
   // Allocate the class first.
   const String& class_name = String::Handle(Symbols::New("MyClass"));
   const Script& script = Script::Handle();
   const Class& cls = Class::Handle(
       Class::New(class_name, script, Scanner::kDummyTokenIndex));
 
   // Class has no fields.
-  const Array& no_fields = Array::Handle(Array::Empty());
+  const Array& no_fields = Array::Handle(Object::empty_array());
   cls.SetFields(no_fields);
 
   // Create and populate the function arrays.
   const Array& functions = Array::Handle(Array::New(6));
   Function& function = Function::Handle();
   String& function_name = String::Handle();
   function_name = Symbols::New("foo");
   function = Function::New(
       function_name, RawFunction::kRegularFunction,
       false, false, false, false, cls, 0);
@@ skipping 69 matching lines @@
   String& interface_name = String::Handle();
   interface_name = Symbols::New("Harley");
   interface = Class::New(interface_name, script, Scanner::kDummyTokenIndex);
   interfaces.SetAt(0, Type::Handle(Type::NewNonParameterizedType(interface)));
   interface_name = Symbols::New("Norton");
   interface = Class::New(interface_name, script, Scanner::kDummyTokenIndex);
   interfaces.SetAt(1, Type::Handle(Type::NewNonParameterizedType(interface)));
   cls.set_interfaces(interfaces);
   cls.Finalize();
 
+  ASSERT(cls.functions_cache() == Array::null());
+  cls.InitFunctionsCache();
   const Array& array = Array::Handle(cls.functions_cache());
   array.SetAt(0, function_name);
   cls.set_functions_cache(array);
   String& test_name = String::Handle();
   test_name ^= Array::Handle(cls.functions_cache()).At(0);
   EXPECT(test_name.Equals(function_name));
 }
 
 
 TEST_CASE(TypeArguments) {
@@ skipping 41 matching lines @@
 
 
 TEST_CASE(InstanceClass) {
   // Allocate the class first.
   String& class_name = String::Handle(Symbols::New("EmptyClass"));
   Script& script = Script::Handle();
   const Class& empty_class =
       Class::Handle(Class::New(class_name, script, Scanner::kDummyTokenIndex));
 
   // No functions and no super class for the EmptyClass.
-  const Array& no_fields = Array::Handle(Array::Empty());
+  const Array& no_fields = Array::Handle(Object::empty_array());
   empty_class.SetFields(no_fields);
   empty_class.Finalize();
   EXPECT_EQ(kObjectAlignment, empty_class.instance_size());
   Instance& instance = Instance::Handle(Instance::New(empty_class));
   EXPECT_EQ(empty_class.raw(), instance.clazz());
 
   class_name = Symbols::New("OneFieldClass");
   const Class& one_field_class =
       Class::Handle(Class::New(class_name, script, Scanner::kDummyTokenIndex));
 
@@ skipping 10 matching lines @@
             one_field_class.instance_size());
   EXPECT_EQ(header_size, field.Offset());
 }
 
 
 TEST_CASE(Interface) {
   String& class_name = String::Handle(Symbols::New("EmptyClass"));
   Script& script = Script::Handle();
   const Class& factory_class =
       Class::Handle(Class::New(class_name, script, Scanner::kDummyTokenIndex));
-  const Array& no_fields = Array::Handle(Array::Empty());
+  const Array& no_fields = Array::Handle(Object::empty_array());
   // Finalizes the class.
   factory_class.SetFields(no_fields);
 
   String& interface_name = String::Handle(Symbols::New("MyInterface"));
   const Class& interface = Class::Handle(
       Class::NewInterface(interface_name, script, Scanner::kDummyTokenIndex));
   EXPECT(interface.is_interface());
   EXPECT(!factory_class.is_interface());
   EXPECT(!interface.HasFactoryClass());
   interface.set_factory_class(factory_class);
@@ skipping 1541 matching lines @@
   EXPECT(array.Equals(other_array));
 
   other_array.SetAt(1, other_array);
   EXPECT(!array.Equals(other_array));
 
   other_array = Array::New(kArrayLen - 1);
   other_array.SetAt(0, array);
   other_array.SetAt(2, array);
   EXPECT(!array.Equals(other_array));
 
-  EXPECT_EQ(0, Array::Handle(Array::Empty()).Length());
+  EXPECT_EQ(0, Array::Handle(Object::empty_array()).Length());
 }
 
 
 TEST_CASE(GrowableObjectArray) {
   const int kArrayLen = 5;
   Smi& value = Smi::Handle();
   Smi& expected_value = Smi::Handle();
   GrowableObjectArray& array = GrowableObjectArray::Handle();
 
   // Test basic growing functionality.
@@ skipping 1086 matching lines @@
       "#6      MyClass.foo (dart:test-lib:32:14)\n"
       "#7      MyClass.MyClass.<anonymous closure> (dart:test-lib:21:15)\n"
       "#8      MyClass.MyClass (dart:test-lib:21:18)\n"
       "#9      main.<anonymous closure> (dart:test-lib:37:10)\n"
       "#10     main (dart:test-lib:37:24)");
 }
 
 #endif  // defined(TARGET_ARCH_IA32) || defined(TARGET_ARCH_X64).
 
 }  // namespace dart