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/oat/runtime/support_stubs.cc

diff --git a/src/oat/runtime/support_stubs.cc b/src/oat/runtime/support_stubs.cc
index 3c98ae7..161a7b2 100644
--- a/src/oat/runtime/support_stubs.cc
+++ b/src/oat/runtime/support_stubs.cc
@@ -82,7 +82,7 @@
     mirror::Class* called_class = called->GetDeclaringClass();
     linker->EnsureInitialized(called_class, true, true);
     if (LIKELY(called_class->IsInitialized())) {
-      code = called->GetCode();
+      code = called->GetEntryPointFromCompiledCode();
       // TODO: remove this after we solve the link issue.
       { // for lazy link.
         if (code == NULL) {
@@ -96,7 +96,7 @@
         code = linker->GetOatCodeFor(called);
       } else {
         // No trampoline for non-static methods.
-        code = called->GetCode();
+        code = called->GetEntryPointFromCompiledCode();
         // TODO: remove this after we solve the link issue.
         { // for lazy link.
           if (code == NULL) {
@@ -303,7 +303,7 @@
     mirror::Class* called_class = called->GetDeclaringClass();
     linker->EnsureInitialized(called_class, true, true);
     if (LIKELY(called_class->IsInitialized())) {
-      code = called->GetCode();
+      code = called->GetEntryPointFromCompiledCode();
     } else if (called_class->IsInitializing()) {
       if (invoke_type == kStatic) {
         // Class is still initializing, go to oat and grab code (trampoline must be left in place
@@ -311,7 +311,7 @@
         code = linker->GetOatCodeFor(called);
       } else {
         // No trampoline for non-static methods.
-        code = called->GetCode();
+        code = called->GetEntryPointFromCompiledCode();
       }
     } else {
       DCHECK(called_class->IsErroneous());