--- a/graal/GraalCompiler/src/com/sun/c1x/ir/NullCheck.java	Wed Apr 27 20:27:43 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/ir/NullCheck.java	Wed Apr 27 20:58:01 2011 +0200
@@ -30,8 +30,6 @@
 
 /**
  * The {@code NullCheck} class represents an explicit null check instruction.
- *
- * @author Ben L. Titzer
  */
 public final class NullCheck extends StateSplit {
 
@@ -46,9 +44,6 @@
         super(obj.kind, stateBefore);
         this.object = obj;
         setFlag(Flag.NonNull);
-        if (object.isNonNull()) {
-            eliminateNullCheck();
-        }
     }
 
     /**
@@ -65,7 +60,7 @@
      */
     @Override
     public boolean canTrap() {
-        return needsNullCheck();
+        return true;
     }
 
     @Override
@@ -105,11 +100,6 @@
     }
 
     @Override
-    public void runtimeCheckCleared() {
-        clearState();
-    }
-
-    @Override
     public void print(LogStream out) {
         out.print("null_check(").print(object()).print(')');
         if (!canTrap()) {