commit 1caa2c205e51dda670207828f25451fb7623cea6
author Brian Carlstrom <bdc@google.com> Sun Aug 28 13:02:33 2011 -0700
committer Brian Carlstrom <bdc@google.com> Sun Aug 28 14:19:11 2011 -0700
tree 7362e7c75871bbcc9c317598547f4bcba01d0907
parent dfd3d70e58c37b5d56eded3a4469082d8bb26ee0

Add InitializedStaticStorage table

A non-null entry in the table not only provides access to the storage,
it also implies that the referenced type is initialized.

Change-Id: Ief9e88b7e58b65b6f9456a4218b7fe87f71c17bb

src/class_linker_test.cc

diff --git a/src/class_linker_test.cc b/src/class_linker_test.cc
index 9fd5fb5..8de8ba1 100644
--- a/src/class_linker_test.cc
+++ b/src/class_linker_test.cc
@@ -102,16 +102,23 @@
     EXPECT_TRUE(method->GetSignature() != NULL);
 
     EXPECT_TRUE(method->dex_cache_strings_ != NULL);
-    EXPECT_TRUE(method->dex_cache_types_ != NULL);
-    EXPECT_TRUE(method->dex_cache_methods_ != NULL);
-    EXPECT_TRUE(method->dex_cache_fields_ != NULL);
+    EXPECT_TRUE(method->dex_cache_resolved_types_ != NULL);
+    EXPECT_TRUE(method->dex_cache_resolved_methods_ != NULL);
+    EXPECT_TRUE(method->dex_cache_resolved_fields_ != NULL);
     EXPECT_TRUE(method->dex_cache_code_and_direct_methods_ != NULL);
-    EXPECT_EQ(method->declaring_class_->dex_cache_->GetStrings(), method->dex_cache_strings_);
-    EXPECT_EQ(method->declaring_class_->dex_cache_->GetTypes(), method->dex_cache_types_);
-    EXPECT_EQ(method->declaring_class_->dex_cache_->GetMethods(), method->dex_cache_methods_);
-    EXPECT_EQ(method->declaring_class_->dex_cache_->GetFields(), method->dex_cache_fields_);
+    EXPECT_TRUE(method->dex_cache_initialized_static_storage_ != NULL);
+    EXPECT_EQ(method->declaring_class_->dex_cache_->GetStrings(),
+              method->dex_cache_strings_);
+    EXPECT_EQ(method->declaring_class_->dex_cache_->GetResolvedTypes(),
+              method->dex_cache_resolved_types_);
+    EXPECT_EQ(method->declaring_class_->dex_cache_->GetResolvedMethods(),
+              method->dex_cache_resolved_methods_);
+    EXPECT_EQ(method->declaring_class_->dex_cache_->GetResolvedFields(),
+              method->dex_cache_resolved_fields_);
     EXPECT_EQ(method->declaring_class_->dex_cache_->GetCodeAndDirectMethods(),
               method->dex_cache_code_and_direct_methods_);
+    EXPECT_EQ(method->declaring_class_->dex_cache_->GetInitializedStaticStorage(),
+              method->dex_cache_initialized_static_storage_);
   }
 
   void AssertField(Class* klass, Field* field) {