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/compiler/llvm/gbc_expander.cc

diff --git a/src/compiler/llvm/gbc_expander.cc b/src/compiler/llvm/gbc_expander.cc
index c1e35a6..99c8fd5 100644
--- a/src/compiler/llvm/gbc_expander.cc
+++ b/src/compiler/llvm/gbc_expander.cc
@@ -852,7 +852,7 @@
   } else {
     code_addr =
         irb_.LoadFromObjectOffset(callee_method_object_addr,
-                                  art::mirror::AbstractMethod::GetCodeOffset().Int32Value(),
+                                  art::mirror::AbstractMethod::GetEntryPointFromCompiledCodeOffset().Int32Value(),
                                   func_type->getPointerTo(), kTBAARuntimeInfo);
   }
 
@@ -1200,7 +1200,7 @@
 
   llvm::Value* code_addr =
     irb_.LoadFromObjectOffset(callee_method_object_addr,
-                              art::mirror::AbstractMethod::GetCodeOffset().Int32Value(),
+                              art::mirror::AbstractMethod::GetEntryPointFromCompiledCodeOffset().Int32Value(),
                               callee_method_type->getPointerTo(),
                               kTBAARuntimeInfo);
 

src/compiler/llvm/runtime_support_llvm.cc

diff --git a/src/compiler/llvm/runtime_support_llvm.cc b/src/compiler/llvm/runtime_support_llvm.cc
index d6c8181..bd6b01b 100644
--- a/src/compiler/llvm/runtime_support_llvm.cc
+++ b/src/compiler/llvm/runtime_support_llvm.cc
@@ -339,7 +339,7 @@
     }
   }
   DCHECK(!thread->IsExceptionPending());
-  const void* code = method->GetCode();
+  const void* code = method->GetEntryPointFromCompiledCode();
 
   // When we return, the caller will branch to this address, so it had better not be 0!
   if (UNLIKELY(code == NULL)) {