commit 0571d357843c53e042f370f5f2c2e9aa3fe803a9
author Ian Rogers <irogers@google.com> Thu Nov 03 19:51:38 2011 -0700
committer Ian Rogers <irogers@google.com> Sun Nov 13 11:57:18 2011 -0800
tree 197e5b1c0b1bf0ee8cc0e1960470d0a8d203b4af
parent 33dc7717cd16592bcc825350bea6305be9eb2ea1

Refactor the use of Method by the compiler.

Remove the dependence on the Method object in dex2oat, allowing lazier
resolution.
Introduce new find and iterators in DexFile to simplify common
operations and avoid misuse of class data items.

Change-Id: I39fb8252190f543d89d8b233076355cec310fe08

src/oat_test.cc

diff --git a/src/oat_test.cc b/src/oat_test.cc
index e90d2ed..e3186de 100644
--- a/src/oat_test.cc
+++ b/src/oat_test.cc
@@ -37,8 +37,11 @@
   for (size_t i = 0; i < dex_file.NumClassDefs(); i++) {
     const DexFile::ClassDef& class_def = dex_file.GetClassDef(i);
     const byte* class_data = dex_file.GetClassData(class_def);
-    DexFile::ClassDataHeader header = dex_file.ReadClassDataHeader(&class_data);
-    size_t num_virtual_methods = header.virtual_methods_size_;
+    size_t num_virtual_methods =0;
+    if (class_data != NULL) {
+      ClassDataItemIterator it(dex_file, class_data);
+      num_virtual_methods = it.NumVirtualMethods();
+    }
     const char* descriptor = dex_file.GetClassDescriptor(class_def);
 
     UniquePtr<const OatFile::OatClass> oat_class(oat_dex_file->GetOatClass(i));
@@ -49,12 +52,13 @@
     for (size_t i = 0; i < klass->NumDirectMethods(); i++, method_index++) {
       Method* method = klass->GetDirectMethod(i);
       const OatFile::OatMethod oat_method = oat_class->GetOatMethod(method_index);
-      const CompiledMethod* compiled_method = compiler_->GetCompiledMethod(method);
+      const CompiledMethod* compiled_method =
+          compiler_->GetCompiledMethod(Compiler::MethodReference(&dex_file,
+                                                                 method->GetDexMethodIndex()));
 
       if (compiled_method == NULL) {
         EXPECT_TRUE(oat_method.code_ == NULL) << PrettyMethod(method) << " " << oat_method.code_;
         EXPECT_EQ(oat_method.frame_size_in_bytes_, static_cast<uint32_t>(kStackAlignment));
-        EXPECT_EQ(oat_method.return_pc_offset_in_bytes_, 0U);
         EXPECT_EQ(oat_method.core_spill_mask_, 0U);
         EXPECT_EQ(oat_method.fp_spill_mask_, 0U);
       } else {
@@ -68,7 +72,6 @@
             << PrettyMethod(method) << " " << code_size;
         CHECK_EQ(0, memcmp(oat_code, &code[0], code_size));
         EXPECT_EQ(oat_method.frame_size_in_bytes_, compiled_method->GetFrameSizeInBytes());
-        EXPECT_EQ(oat_method.return_pc_offset_in_bytes_, compiled_method->GetReturnPcOffsetInBytes());
         EXPECT_EQ(oat_method.core_spill_mask_, compiled_method->GetCoreSpillMask());
         EXPECT_EQ(oat_method.fp_spill_mask_, compiled_method->GetFpSpillMask());
       }
@@ -76,12 +79,13 @@
     for (size_t i = 0; i < num_virtual_methods; i++, method_index++) {
       Method* method = klass->GetVirtualMethod(i);
       const OatFile::OatMethod oat_method = oat_class->GetOatMethod(method_index);
-      const CompiledMethod* compiled_method = compiler_->GetCompiledMethod(method);
+      const CompiledMethod* compiled_method =
+          compiler_->GetCompiledMethod(Compiler::MethodReference(&dex_file,
+                                                                 method->GetDexMethodIndex()));
 
       if (compiled_method == NULL) {
         EXPECT_TRUE(oat_method.code_ == NULL) << PrettyMethod(method) << " " << oat_method.code_;
         EXPECT_EQ(oat_method.frame_size_in_bytes_, static_cast<uint32_t>(kStackAlignment));
-        EXPECT_EQ(oat_method.return_pc_offset_in_bytes_, 0U);
         EXPECT_EQ(oat_method.core_spill_mask_, 0U);
         EXPECT_EQ(oat_method.fp_spill_mask_, 0U);
       } else {
@@ -96,7 +100,6 @@
             << PrettyMethod(method) << " " << code_size;
         CHECK_EQ(0, memcmp(oat_code, &code[0], code_size));
         EXPECT_EQ(oat_method.frame_size_in_bytes_, compiled_method->GetFrameSizeInBytes());
-        EXPECT_EQ(oat_method.return_pc_offset_in_bytes_, compiled_method->GetReturnPcOffsetInBytes());
         EXPECT_EQ(oat_method.core_spill_mask_, compiled_method->GetCoreSpillMask());
         EXPECT_EQ(oat_method.fp_spill_mask_, compiled_method->GetFpSpillMask());
       }