--- a/hotspot/test/runtime/Unsafe/GetPutLong.java	Tue Dec 02 19:47:45 2014 +0100
+++ b/hotspot/test/runtime/Unsafe/GetPutLong.java	Tue Feb 10 14:10:43 2015 +0100
@@ -39,7 +39,7 @@
         Test t = new Test();
         Field field = Test.class.getField("l");
 
-        int offset = unsafe.fieldOffset(field);
+        long offset = unsafe.objectFieldOffset(field);
         assertEquals(-1L, unsafe.getLong(t, offset));
         unsafe.putLong(t, offset, 0L);
         assertEquals(0L, unsafe.getLong(t, offset));