commit 6d4d9fcb4f01e287ee29e81cd1c941ee5d11d379
author Ian Rogers <irogers@google.com> Wed Nov 30 16:24:48 2011 -0800
committer Ian Rogers <irogers@google.com> Tue Dec 06 14:02:09 2011 -0800
tree 4c715bef86a3c5a47f9cea43c4a092cf4766ed4b
parent 86b0010c79ef95b5333cd540b7d3af34a9f1a643

Reduce meta-data object sizes, introduce meta-data helper classes.

Change-Id: Id14ad218f1c74c659701352fdf1a45bf6444daa3

src/oatdump.cc

diff --git a/src/oatdump.cc b/src/oatdump.cc
index ac9449f..5cff2ea 100644
--- a/src/oatdump.cc
+++ b/src/oatdump.cc
@@ -12,6 +12,7 @@
 #include "file.h"
 #include "image.h"
 #include "os.h"
+#include "object_utils.h"
 #include "runtime.h"
 #include "space.h"
 #include "stringpiece.h"
@@ -299,7 +300,8 @@
     StringAppendF(&summary, "%p: ", obj);
     if (obj->IsClass()) {
       Class* klass = obj->AsClass();
-      StringAppendF(&summary, "CLASS %s", klass->GetDescriptor()->ToModifiedUtf8().c_str());
+      summary += "CLASS ";
+      summary += ClassHelper(klass).GetDescriptor();
       std::ostringstream ss;
       ss << " (" << klass->GetStatus() << ")";
       summary += ss.str();
@@ -317,7 +319,7 @@
       StringAppendF(&summary, "OBJECT");
     }
     StringAppendF(&summary, "\n");
-    std::string descriptor = obj->GetClass()->GetDescriptor()->ToModifiedUtf8();
+    std::string descriptor(ClassHelper(obj->GetClass()).GetDescriptor());
     StringAppendF(&summary, "\tclass %p: %s\n", obj->GetClass(), descriptor.c_str());
     state->stats_.descriptor_to_bytes[descriptor] += object_bytes;
     state->stats_.descriptor_to_count[descriptor] += 1;
@@ -359,10 +361,7 @@
           state->stats_.pc_mapping_table_bytes += pc_mapping_table_bytes;
         }
 
-        ClassLinker* class_linker = Runtime::Current()->GetClassLinker();
-        class DexCache* dex_cache = method->GetDeclaringClass()->GetDexCache();
-        const DexFile& dex_file = class_linker->FindDexFile(dex_cache);
-        const DexFile::CodeItem* code_item = dex_file.GetCodeItem(method->GetCodeItemOffset());
+        const DexFile::CodeItem* code_item = MethodHelper(method).GetCodeItem();
         size_t dex_instruction_bytes = code_item->insns_size_in_code_units_ * 2;
         state->stats_.dex_instruction_bytes += dex_instruction_bytes;
       }