commit 92f14b266d0d9b5b5645bb56447a5dd22217b92c
author Elliott Hughes <enh@google.com> Thu Oct 06 12:29:54 2011 -0700
committer Elliott Hughes <enh@google.com> Thu Oct 06 12:31:39 2011 -0700
tree f3b08336085ce25b8c3bf7b97b3cca547e792d2f
parent 510c878c73d944e8306d346e978f880bf2d06fd9

Make sure that array_iftables_ is initialized when loading from an image.

This fixes test 009-instanceof2.

Change-Id: Ieba95a295e34381aeb16f5950376ff8700b624de

src/object_test.cc

diff --git a/src/object_test.cc b/src/object_test.cc
index 167c770..c13a19d 100644
--- a/src/object_test.cc
+++ b/src/object_test.cc
@@ -343,10 +343,18 @@
   EXPECT_TRUE(y->InstanceOf(X));
   EXPECT_TRUE(y->InstanceOf(Y));
 
-  Class* Class_class = class_linker_->FindSystemClass("Ljava/lang/Class;");
+  Class* java_lang_Class = class_linker_->FindSystemClass("Ljava/lang/Class;");
   Class* Object_array_class = class_linker_->FindSystemClass("[Ljava/lang/Object;");
-  EXPECT_FALSE(Class_class->InstanceOf(Object_array_class));
-  EXPECT_TRUE(Object_array_class->InstanceOf(Class_class));
+
+  EXPECT_FALSE(java_lang_Class->InstanceOf(Object_array_class));
+  EXPECT_TRUE(Object_array_class->InstanceOf(java_lang_Class));
+
+  // All array classes implement Cloneable and Serializable.
+  Object* array = ObjectArray<Object>::Alloc(Object_array_class, 1);
+  Class* java_lang_Cloneable = class_linker_->FindSystemClass("Ljava/lang/Cloneable;");
+  Class* java_io_Serializable = class_linker_->FindSystemClass("Ljava/io/Serializable;");
+  EXPECT_TRUE(array->InstanceOf(java_lang_Cloneable));
+  EXPECT_TRUE(array->InstanceOf(java_io_Serializable));
 }
 
 TEST_F(ObjectTest, IsAssignableFrom) {