commit aa4a793d7175ceeb1efa215c2af5e52e42b22f0a
author Jeff Hao <jeffhao@google.com> Mon May 13 11:28:27 2013 -0700
committer Jeff Hao <jeffhao@google.com> Mon May 13 13:14:19 2013 -0700
tree 9c3db54a108d4327471c6d4890d28cdfe1f030ff
parent 167436311a08a65dea28dda079a137893821c9c7

Rename abstract method code_ to entry_point_from_compiled_code_.

Change-Id: I9b02d2df95bbeafa6e6387b461f574c57337a61e

src/oatdump.cc

diff --git a/src/oatdump.cc b/src/oatdump.cc
index 353abca..7a99f8d 100644
--- a/src/oatdump.cc
+++ b/src/oatdump.cc
@@ -879,7 +879,7 @@
 
   const void* GetOatCodeBegin(mirror::AbstractMethod* m)
       SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) {
-    const void* code = m->GetCode();
+    const void* code = m->GetEntryPointFromCompiledCode();
     if (code == GetResolutionTrampoline()) {
       code = oat_dumper_->GetOatCode(m);
     }
@@ -990,7 +990,7 @@
         if (first_occurrence) {
           state->stats_.native_to_managed_code_bytes += oat_code_size;
         }
-        if (oat_code != method->GetCode()) {
+        if (oat_code != method->GetEntryPointFromCompiledCode()) {
           indent_os << StringPrintf("OAT CODE: %p\n", oat_code);
         }
       } else if (method->IsAbstract() || method->IsCalleeSaveMethod() ||
@@ -998,7 +998,7 @@
         DCHECK(method->GetNativeGcMap() == NULL) << PrettyMethod(method);
         DCHECK(method->GetMappingTable() == NULL) << PrettyMethod(method);
       } else {
-        CHECK((method->GetCode() == NULL) || (method->GetNativeGcMap() != NULL));
+        CHECK((method->GetEntryPointFromCompiledCode() == NULL) || (method->GetNativeGcMap() != NULL));
 
         const DexFile::CodeItem* code_item = MethodHelper(method).GetCodeItem();
         size_t dex_instruction_bytes = code_item->insns_size_in_code_units_ * 2;