--- old/src/cpu/aarch64/vm/jniFastGetField_aarch64.cpp	2015-06-27 04:11:01.000000000 +0300
+++ new/src/cpu/aarch64/vm/jniFastGetField_aarch64.cpp	2015-06-27 04:11:01.000000000 +0300
@@ -29,6 +29,7 @@
 #include "prims/jniFastGetField.hpp"
 #include "prims/jvm_misc.hpp"
 #include "runtime/safepoint.hpp"
+#include "runtime/jfieldIDWorkaround.hpp"
 
 #define __ masm->
 
@@ -82,7 +83,7 @@
                                               // robj ^ rcounter ^ rcounter == robj
                                               // robj is address dependent on rcounter.
   __ ldr(robj, Address(robj, 0));             // *obj
-  __ lsr(roffset, c_rarg2, 2);                // offset
+  __ lsr(roffset, c_rarg2, jfieldIDWorkaround::offset_shift); // offset
 
   assert(count < LIST_CAPACITY, "LIST_CAPACITY too small");
   speculative_load_pclist[count] = __ pc();   // Used by the segfault handler