Mercurial > hg > truffle

changeset 4552:bc14f8e7d5ed

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixed another endless recompilation
author Christian Haeubl <christian.haeubl@oracle.com>
date Thu, 09 Feb 2012 17:03:44 -0800
parents a7a16015e47f
children 7d0d849abf80
files graal/com.oracle.max.graal.hotspot/src/com/oracle/max/graal/hotspot/ri/HotSpotMethodData.java graal/com.oracle.max.graal.java/src/com/oracle/max/graal/java/BciBlockMapping.java
diffstat 2 files changed, 1 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- 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);
--- 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: