Mercurial > hg > graal-compiler

changeset 10683:ae4c79ee71d1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Tue, 09 Jul 2013 22:05:40 +0200
parents 725922588833 (current diff) 311abd52ffeb (diff)
children 6ff467cdb105 d2055a110396
files
diffstat 3 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/FrameWithoutBoxing.java	Tue Jul 09 21:53:50 2013 +0200
+++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/FrameWithoutBoxing.java	Tue Jul 09 22:05:40 2013 +0200
@@ -286,6 +286,6 @@
 
     @Override
     public boolean isInitialized(FrameSlot slot) {
-        return !(this.tags[slot.getIndex()] == FrameSlotKind.Illegal.ordinal());
+        return tags[slot.getIndex()] != FrameSlotKind.Illegal.ordinal();
     }
 }
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/FrameAccessNode.java	Tue Jul 09 21:53:50 2013 +0200
+++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/FrameAccessNode.java	Tue Jul 09 22:05:40 2013 +0200
@@ -32,6 +32,7 @@
 import com.oracle.graal.nodes.java.*;
 import com.oracle.graal.nodes.spi.*;
 import com.oracle.graal.nodes.type.*;
+import com.oracle.graal.truffle.*;
 import com.oracle.truffle.api.frame.*;
 
 /**
@@ -145,6 +146,8 @@
             if (!isValidAccessKind()) {
                 tool.deleteBranch(this.next());
                 this.replaceAndDelete(graph().add(new DeoptimizeNode(DeoptimizationAction.InvalidateReprofile, DeoptimizationReason.UnreachedCode)));
+            } else {
+                tool.assumptions().record(new AssumptionValidAssumption((OptimizedAssumption) getFrameSlot().getFrameDescriptor().getVersion()));
             }
         }
     }
--- a/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/impl/DefaultVirtualFrame.java	Tue Jul 09 21:53:50 2013 +0200
+++ b/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/impl/DefaultVirtualFrame.java	Tue Jul 09 22:05:40 2013 +0200
@@ -204,6 +204,6 @@
 
     @Override
     public boolean isInitialized(FrameSlot slot) {
-        return (this.tags[slot.getIndex()] != FrameSlotKind.Illegal.ordinal());
+        return tags[slot.getIndex()] != FrameSlotKind.Illegal.ordinal();
     }
 }