commit 565f50731db360584d0080af7f14f0b7ca10371c
author Carl Shapiro <cshapiro@google.com> Sun Jul 10 13:39:43 2011 -0700
committer Carl Shapiro <cshapiro@google.com> Sun Jul 10 13:39:43 2011 -0700
tree 24de84a0b0a0a8cc2cb75cd048232f29d4f2adbf
parent 606258b5713ac3a0958db3b4b98074b6df6439a6

Initialize primitive type classes during linker initialization.

Change-Id: Ib31da85afcc59c5d0a14346fb7f97043487fd662

src/object_test.cc

diff --git a/src/object_test.cc b/src/object_test.cc
index 7cbf086..6ce3570 100644
--- a/src/object_test.cc
+++ b/src/object_test.cc
@@ -53,8 +53,9 @@
   scoped_ptr<DexFile> dex_file(DexFile::OpenBase64(kProtoCompareDex));
   ASSERT_TRUE(dex_file != NULL);
 
-  Class* klass = dex_file->LoadClass("LProtoCompare;");
-  ASSERT_TRUE(klass != NULL);
+  scoped_ptr<Class> klass(reinterpret_cast<Class*>(new byte[sizeof(Class)]));
+  bool result = dex_file->LoadClass("LProtoCompare;", klass.get());
+  ASSERT_TRUE(result);
 
   ASSERT_EQ(4U, klass->NumVirtualMethods());
 
@@ -130,10 +131,12 @@
   scoped_ptr<DexFile> dex_file2(DexFile::OpenBase64(kProtoCompare2Dex));
   ASSERT_TRUE(dex_file2 != NULL);
 
-  Class* klass1 = dex_file1->LoadClass("LProtoCompare;");
-  ASSERT_TRUE(klass1 != NULL);
-  Class* klass2 = dex_file2->LoadClass("LProtoCompare2;");
-  ASSERT_TRUE(klass2 != NULL);
+  scoped_ptr<Class> klass1(reinterpret_cast<Class*>(new byte[sizeof(Class)]));
+  bool result1 = dex_file1->LoadClass("LProtoCompare;", klass1.get());
+  ASSERT_TRUE(result1);
+  scoped_ptr<Class> klass2(reinterpret_cast<Class*>(new byte[sizeof(Class)]));
+  bool result2 = dex_file2->LoadClass("LProtoCompare2;", klass2.get());
+  ASSERT_TRUE(result2);
 
   Method* m1_1 = klass1->GetVirtualMethod(0);
   ASSERT_STREQ("m1", m1_1->GetName().data());