# HG changeset patch # User Doug Simon # Date 1417031898 -3600 # Node ID 5851c17b571ea65fbafb48a531344c35a050e5f7 # Parent b1a6992a0e42965fd9834899f05e29a0d381558b removed usages of HotSPotGraalRuntime.unsafeReadWord() diff -r b1a6992a0e42 -r 5851c17b571e graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotMethodData.java --- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotMethodData.java Wed Nov 26 20:53:20 2014 +0100 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotMethodData.java Wed Nov 26 20:58:18 2014 +0100 @@ -176,7 +176,7 @@ */ private long readUnsignedInt(int position, int offsetInBytes) { long fullOffsetInBytes = computeFullOffset(position, offsetInBytes); - return unsafeReadWord(metaspaceMethodData + fullOffsetInBytes) & 0xFFFFFFFFL; + return unsafe.getAddress(metaspaceMethodData + fullOffsetInBytes) & 0xFFFFFFFFL; } private int readUnsignedIntAsSignedInt(int position, int offsetInBytes) { @@ -191,12 +191,12 @@ */ private int readInt(int position, int offsetInBytes) { long fullOffsetInBytes = computeFullOffset(position, offsetInBytes); - return (int) unsafeReadWord(metaspaceMethodData + fullOffsetInBytes); + return (int) unsafe.getAddress(metaspaceMethodData + fullOffsetInBytes); } private long readWord(int position, int offsetInBytes) { long fullOffsetInBytes = computeFullOffset(position, offsetInBytes); - return unsafeReadWord(metaspaceMethodData + fullOffsetInBytes); + return unsafe.getAddress(metaspaceMethodData + fullOffsetInBytes); } private static int truncateLongToInt(long value) { @@ -332,7 +332,11 @@ return data.readUnsignedByte(position, config.dataLayoutFlagsOffset); } - protected int getDynamicSize(@SuppressWarnings("unused") HotSpotMethodData data, @SuppressWarnings("unused") int position) { + /** + * @param data + * @param position + */ + protected int getDynamicSize(HotSpotMethodData data, int position) { return 0; }