diff -r c6f50d62ecef -r a29d2048e16a hotspot/test/runtime/Unsafe/GetPutShort.java
--- a/hotspot/test/runtime/Unsafe/GetPutShort.java	Tue Dec 02 19:47:45 2014 +0100
+++ b/hotspot/test/runtime/Unsafe/GetPutShort.java	Tue Feb 10 14:10:43 2015 +0100
@@ -39,7 +39,7 @@
         Test t = new Test();
         Field field = Test.class.getField("s");
 
-        int offset = unsafe.fieldOffset(field);
+        long offset = unsafe.objectFieldOffset(field);
         assertEquals((short)-1, unsafe.getShort(t, offset));
         unsafe.putShort(t, offset, (short)0);
         assertEquals((short)0, unsafe.getShort(t, offset));