# HG changeset patch # User Christian Haeubl # Date 1328835824 28800 # Node ID bc14f8e7d5ed75cbeaf96780f06a3b699584826f # Parent a7a16015e47f5f91b84ebb647c6ac9eb4feb5421 fixed another endless recompilation diff -r a7a16015e47f -r bc14f8e7d5ed graal/com.oracle.max.graal.hotspot/src/com/oracle/max/graal/hotspot/ri/HotSpotMethodData.java --- a/graal/com.oracle.max.graal.hotspot/src/com/oracle/max/graal/hotspot/ri/HotSpotMethodData.java Thu Feb 09 13:26:51 2012 -0800 +++ b/graal/com.oracle.max.graal.hotspot/src/com/oracle/max/graal/hotspot/ri/HotSpotMethodData.java Thu Feb 09 17:03:44 2012 -0800 @@ -91,7 +91,7 @@ } public HotSpotMethodDataAccessor getExtraData(int position) { - if (position >= extraDataSize) { + if (position >= normalDataSize + extraDataSize) { return null; } return getData(position); diff -r a7a16015e47f -r bc14f8e7d5ed graal/com.oracle.max.graal.java/src/com/oracle/max/graal/java/BciBlockMapping.java --- a/graal/com.oracle.max.graal.java/src/com/oracle/max/graal/java/BciBlockMapping.java Thu Feb 09 13:26:51 2012 -0800 +++ b/graal/com.oracle.max.graal.java/src/com/oracle/max/graal/java/BciBlockMapping.java Thu Feb 09 17:03:44 2012 -0800 @@ -363,12 +363,6 @@ private static boolean canTrap(int opcode, int bci, RiProfilingInfo profilingInfo) { switch (opcode) { - case INVOKESTATIC: - case INVOKESPECIAL: - case INVOKEVIRTUAL: - case INVOKEINTERFACE: { - return true; - } case IASTORE: case LASTORE: case FASTORE: