# HG changeset patch
# User Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
# Date 1373400340 -7200
# Node ID ae4c79ee71d1e11eee844ae582f05c56bd9fba58
# Parent  72592258883389cfd4bce8025a0b6d2e8e7935c5# Parent  311abd52ffeb45aff636e1836ef1ece74050f7b6
Merge.

diff -r 725922588833 -r ae4c79ee71d1 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 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();
     }
 }
diff -r 725922588833 -r ae4c79ee71d1 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 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()));
             }
         }
     }
diff -r 725922588833 -r ae4c79ee71d1 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 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();
     }
 }