diff -r c880a8a8803b -r 5c990ed353e9 rt/emul/compact/src/main/java/java/lang/invoke/CallSite.java --- a/rt/emul/compact/src/main/java/java/lang/invoke/CallSite.java Sat Aug 09 11:11:13 2014 +0200 +++ b/rt/emul/compact/src/main/java/java/lang/invoke/CallSite.java Sun Aug 10 06:13:36 2014 +0200 @@ -232,21 +232,13 @@ throw new IllegalStateException("uninitialized call site"); } - // unsafe stuff: - private static final long TARGET_OFFSET; - static { - try { - TARGET_OFFSET = UNSAFE.objectFieldOffset(CallSite.class.getDeclaredField("target")); - } catch (Exception ex) { throw new Error(ex); } - } - /*package-private*/ void setTargetNormal(MethodHandle newTarget) { MethodHandleNatives.setCallSiteTargetNormal(this, newTarget); } /*package-private*/ MethodHandle getTargetVolatile() { - return (MethodHandle) UNSAFE.getObjectVolatile(this, TARGET_OFFSET); + return target; } /*package-private*/ void setTargetVolatile(MethodHandle newTarget) {