# HG changeset patch
# User Andreas Woess <andreas.woess@jku.at>
# Date 1373397603 -7200
# Node ID 311abd52ffeb45aff636e1836ef1ece74050f7b6
# Parent  759415ed915a5a2e65c85752105272a58d8f3057# Parent  0c570e82cc1d6e179767ecf3890bdb58c4ae7983
Merge

diff -r 759415ed915a -r 311abd52ffeb graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/FrameWithoutBoxing.java
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/FrameWithoutBoxing.java	Tue Jul 09 20:09:24 2013 +0200
+++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/FrameWithoutBoxing.java	Tue Jul 09 21:20:03 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();
     }
 }
diff -r 759415ed915a -r 311abd52ffeb graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/FrameAccessNode.java
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/FrameAccessNode.java	Tue Jul 09 20:09:24 2013 +0200
+++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/FrameAccessNode.java	Tue Jul 09 21:20:03 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()));
             }
         }
     }
diff -r 759415ed915a -r 311abd52ffeb graal/com.oracle.truffle.api/src/com/oracle/truffle/api/impl/DefaultVirtualFrame.java
--- a/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/impl/DefaultVirtualFrame.java	Tue Jul 09 20:09:24 2013 +0200
+++ b/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/impl/DefaultVirtualFrame.java	Tue Jul 09 21:20:03 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();
     }
 }