commit e10b6974d54f38001aee7bec518d45a7d4fb64c1
author Brian Carlstrom <bdc@google.com> Mon Sep 26 13:49:03 2011 -0700
committer Brian Carlstrom <bdc@google.com> Mon Sep 26 15:03:03 2011 -0700
tree 2516ebb62ec0eccc82d4e73a8d51897752f43cf3
parent 03f034949fa7b44aa49e6603d8d5e7a55bf07795

Fix bug in HasSameMethodDescriptorClass on return types

Also included:
- Make oatdump tolerant of missing code
- Include class status in oatdump output
- Additional oat_process support for testing

Change-Id: Id1b8d5662ca061f2dc22b2b087b5a5945e54b91c

src/class_linker.cc

diff --git a/src/class_linker.cc b/src/class_linker.cc
index 9c00d72..becd6d5 100644
--- a/src/class_linker.cc
+++ b/src/class_linker.cc
@@ -1444,7 +1444,9 @@
 bool ClassLinker::HasSameMethodDescriptorClasses(const Method* method,
                                                  const Class* klass1,
                                                  const Class* klass2) {
-  if (method->IsMiranda()) { return true; }
+  if (method->IsMiranda()) {
+      return true;
+  }
   const DexFile& dex_file = FindDexFile(method->GetDeclaringClass()->GetDexCache());
   const DexFile::ProtoId& proto_id = dex_file.GetProtoId(method->GetProtoIdx());
   DexFile::ParameterIterator *it;
@@ -1463,7 +1465,7 @@
   // Check the return type
   const char* descriptor = dex_file.GetReturnTypeDescriptor(proto_id);
   if (descriptor[0] == 'L' || descriptor[0] == '[') {
-    if (HasSameDescriptorClasses(descriptor, klass1, klass2)) {
+    if (!HasSameDescriptorClasses(descriptor, klass1, klass2)) {
       return false;
     }
   }

src/oatdump.cc

diff --git a/src/oatdump.cc b/src/oatdump.cc
index 4cb9cf0..e5911c0 100644
--- a/src/oatdump.cc
+++ b/src/oatdump.cc
@@ -126,6 +126,9 @@
     if (obj->IsClass()) {
       Class* klass = obj->AsClass();
       StringAppendF(&summary, "CLASS %s", klass->GetDescriptor()->ToModifiedUtf8().c_str());
+      std::stringstream ss;
+      ss << " (" << klass->GetStatus() << ")";
+      summary += ss.str();
     } else if (obj->IsMethod()) {
       Method* method = obj->AsMethod();
       StringAppendF(&summary, "METHOD %s", PrettyMethod(method).c_str());
@@ -151,21 +154,32 @@
     //               object_bytes, RoundUp(object_bytes, kObjectAlignment) - object_bytes);
     if (obj->IsMethod()) {
       Method* method = obj->AsMethod();
-      const ByteArray* code = method->GetCodeArray();
       if (!method->IsPhony()) {
-        size_t code_bytes = code->GetLength();
-        if (method->IsNative()) {
-          state->stats_.managed_to_native_code_bytes += code_bytes;
-        } else {
-          state->stats_.managed_code_bytes += code_bytes;
+        const ByteArray* code = method->GetCodeArray();
+        const int8_t* code_base = NULL;
+        const int8_t* code_limit = NULL;
+        if (code != NULL) {
+          size_t code_bytes = code->GetLength();
+          code_base = code->GetData();
+          code_limit = code_base + code_bytes;
+          if (method->IsNative()) {
+            state->stats_.managed_to_native_code_bytes += code_bytes;
+          } else {
+            state->stats_.managed_code_bytes += code_bytes;
+          }
         }
-        StringAppendF(&summary, "\tCODE     %p-%p\n", code->GetData(), code->GetData() + code_bytes);
+        StringAppendF(&summary, "\tCODE     %p-%p\n", code_base, code_limit);
 
         const ByteArray* invoke = method->GetInvokeStubArray();
-        size_t native_to_managed_code_bytes = invoke->GetLength();
-        state->stats_.native_to_managed_code_bytes += native_to_managed_code_bytes;
-        StringAppendF(&summary, "\tJNI STUB %p-%p\n",
-                      invoke->GetData(), invoke->GetData() + native_to_managed_code_bytes);
+        const int8_t* invoke_base = NULL;
+        const int8_t* invoke_limit = NULL;
+        if (invoke != NULL) {
+          size_t native_to_managed_code_bytes = invoke->GetLength();
+          invoke_base = invoke->GetData();
+          invoke_limit = invoke_base + native_to_managed_code_bytes;
+          state->stats_.native_to_managed_code_bytes += native_to_managed_code_bytes;
+          StringAppendF(&summary, "\tJNI STUB %p-%p\n", invoke_base, invoke_limit);
+        }
       }
       if (method->IsNative()) {
         if (method->IsRegistered()) {
@@ -191,8 +205,10 @@
                                      method->GetRegisterMapData()->GetLength());
         state->stats_.register_map_bytes += register_map_bytes;
 
-        size_t pc_mapping_table_bytes = method->GetMappingTable()->GetLength();
-        state->stats_.pc_mapping_table_bytes += pc_mapping_table_bytes;
+        if (method->GetMappingTable() != NULL) {
+          size_t pc_mapping_table_bytes = method->GetMappingTable()->GetLength();
+          state->stats_.pc_mapping_table_bytes += pc_mapping_table_bytes;
+        }
 
         ClassLinker* class_linker = Runtime::Current()->GetClassLinker();
         class DexCache* dex_cache = method->GetDeclaringClass()->GetDexCache();