--- a/graal/GraalCompiler/src/com/sun/c1x/ir/StateSplit.java	Wed Apr 27 20:58:01 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/ir/StateSplit.java	Wed Apr 27 21:22:10 2011 +0200
@@ -49,21 +49,9 @@
         this.stateBefore = stateBefore;
     }
 
-    /**
-     * Determines if the state for this instruction has explicitly
-     * been cleared (as opposed to never initialized). Once explicitly
-     * cleared, an instruction must not have it state (re)set.
-     */
-    public boolean isStateCleared() {
-        return stateBefore == CLEARED_STATE;
-    }
-
-    /**
-     * Clears the state for this instruction. Once explicitly
-     * cleared, an instruction must not have it state (re)set.
-     */
-    protected void clearState() {
-        stateBefore = CLEARED_STATE;
+    @Override
+    public boolean canTrap() {
+        return stateBefore != null;
     }
 
     /**
@@ -82,6 +70,6 @@
      */
     @Override
     public final FrameState stateBefore() {
-        return stateBefore == CLEARED_STATE ? null : stateBefore;
+        return stateBefore;
     }
 }