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
diff --git a/src/compiler_test.cc b/src/compiler_test.cc
index 8ab45b5..1e9f203 100644
--- a/src/compiler_test.cc
+++ b/src/compiler_test.cc
@@ -79,18 +79,18 @@
String* string = dex_cache->GetResolvedString(i);
EXPECT_TRUE(string != NULL);
}
- EXPECT_EQ(dex->NumTypeIds(), dex_cache->NumTypes());
- for (size_t i = 0; i < dex_cache->NumTypes(); i++) {
+ EXPECT_EQ(dex->NumTypeIds(), dex_cache->NumResolvedTypes());
+ for (size_t i = 0; i < dex_cache->NumResolvedTypes(); i++) {
Class* type = dex_cache->GetResolvedType(i);
EXPECT_TRUE(type != NULL);
}
- EXPECT_EQ(dex->NumMethodIds(), dex_cache->NumMethods());
- for (size_t i = 0; i < dex_cache->NumMethods(); i++) {
+ EXPECT_EQ(dex->NumMethodIds(), dex_cache->NumResolvedMethods());
+ for (size_t i = 0; i < dex_cache->NumResolvedMethods(); i++) {
Method* method = dex_cache->GetResolvedMethod(i);
EXPECT_TRUE(method != NULL);
}
- EXPECT_EQ(dex->NumFieldIds(), dex_cache->NumFields());
- for (size_t i = 0; i < dex_cache->NumFields(); i++) {
+ EXPECT_EQ(dex->NumFieldIds(), dex_cache->NumResolvedFields());
+ for (size_t i = 0; i < dex_cache->NumResolvedFields(); i++) {
Field* field = dex_cache->GetResolvedField(i);
EXPECT_TRUE(field != NULL);
}