--- a/graal/GraalCompiler/src/com/sun/c1x/value/FrameStateBuilder.java	Mon May 30 16:24:22 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/value/FrameStateBuilder.java	Mon May 30 17:05:06 2011 +0200
@@ -54,7 +54,7 @@
         if (!isStatic(method.accessFlags())) {
             // add the receiver and assume it is non null
             Local local = new Local(method.holder().kind(), javaIndex, graph);
-            local.setFlag(Value.Flag.NonNull, true);
+            local.setNonNull(true);
             local.setDeclaredType(method.holder());
             storeLocal(javaIndex, local);
             javaIndex = 1;
@@ -322,7 +322,7 @@
     public Value loadLocal(int i) {
         Value x = locals[i];
         if (x != null) {
-            if (x.isIllegal()) {
+            if (x instanceof Phi && ((Phi) x).isDead()) {
                 return null;
             }
             assert x.kind.isSingleWord() || locals[i + 1] == null || locals[i + 1] instanceof Phi;