1.1 --- a/rt/emul/compact/src/main/java/java/lang/invoke/CallSite.java	Sat Aug 09 11:11:13 2014 +0200
     1.2 +++ b/rt/emul/compact/src/main/java/java/lang/invoke/CallSite.java	Sun Aug 10 06:13:36 2014 +0200
     1.3 @@ -232,21 +232,13 @@
     1.4          throw new IllegalStateException("uninitialized call site");
     1.5      }
     1.6  
     1.7 -    // unsafe stuff:
     1.8 -    private static final long TARGET_OFFSET;
     1.9 -    static {
    1.10 -        try {
    1.11 -            TARGET_OFFSET = UNSAFE.objectFieldOffset(CallSite.class.getDeclaredField("target"));
    1.12 -        } catch (Exception ex) { throw new Error(ex); }
    1.13 -    }
    1.14 -
    1.15      /*package-private*/
    1.16      void setTargetNormal(MethodHandle newTarget) {
    1.17          MethodHandleNatives.setCallSiteTargetNormal(this, newTarget);
    1.18      }
    1.19      /*package-private*/
    1.20      MethodHandle getTargetVolatile() {
    1.21 -        return (MethodHandle) UNSAFE.getObjectVolatile(this, TARGET_OFFSET);
    1.22 +        return target;
    1.23      }
    1.24      /*package-private*/
    1.25      void setTargetVolatile(MethodHandle newTarget) {