# HG changeset patch # User Thomas Wuerthinger # Date 1382705101 -7200 # Node ID 2520c78e4c289ad48f8e289eb2831e38b4275293 # Parent 5310cc81f7e4876e6f78ccdb25064d3853c598a0 Merge fix. diff -r 5310cc81f7e4 -r 2520c78e4c28 graal/com.oracle.graal.truffle.hotspot.amd64/src/com/oracle/graal/truffle/hotspot/amd64/util/OptimizedCallTargetFieldInfo.java --- a/graal/com.oracle.graal.truffle.hotspot.amd64/src/com/oracle/graal/truffle/hotspot/amd64/util/OptimizedCallTargetFieldInfo.java Fri Oct 25 13:46:22 2013 +0200 +++ b/graal/com.oracle.graal.truffle.hotspot.amd64/src/com/oracle/graal/truffle/hotspot/amd64/util/OptimizedCallTargetFieldInfo.java Fri Oct 25 14:45:01 2013 +0200 @@ -45,7 +45,7 @@ public static int getCompiledMethodFieldOffset() { if (compiledMethodFieldOffset == -1) { - compiledMethodFieldOffset = getFieldOffset("compiledMethod", OptimizedCallTarget.class); + compiledMethodFieldOffset = getFieldOffset("installedCode", OptimizedCallTarget.class); } return compiledMethodFieldOffset;