commit 508755a3d4d3d67aa834c033c79073c0a08a8fbd
author Nicolas Geoffray <ngeoffray@google.com> Tue Jun 23 11:32:10 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jun 23 11:32:11 2015 +0000
tree afa4cd5bfcb6e65f67456083cca01ba801a82834
parent 87dc1b09cee6e972fbe3ad48ba8b5ae68d37085f
parent 555b3d0fc62ecccb590dc8a07736ca4eda8722e7

Merge "Use GetOffsetDuringLinking instead of GetOffset."

runtime/class_linker.cc

diff --git a/runtime/class_linker.cc b/runtime/class_linker.cc
index 3c1ab12..91b5000 100644
--- a/runtime/class_linker.cc
+++ b/runtime/class_linker.cc
@@ -5212,7 +5212,7 @@
       ArtField* field = &fields[i];
       VLOG(class_linker) << "LinkFields: " << (is_static ? "static" : "instance")
           << " class=" << PrettyClass(klass.Get()) << " field=" << PrettyField(field) << " offset="
-          << field->GetOffset();
+          << field->GetOffsetDuringLinking();
       if (i != 0) {
         ArtField* const prev_field = &fields[i - 1];
         // NOTE: The field names can be the same. This is not possible in the Java language