changeset 2851:14708c03abba

Remove isNonNull
author Gilles Duboscq <gilles.duboscq@oracle.com>
date Tue, 07 Jun 2011 11:36:32 +0200
parents 7474789a8120
children c6bdec623ef9
files graal/GraalCompiler/src/com/sun/c1x/gen/LIRGenerator.java graal/GraalCompiler/src/com/sun/c1x/ir/Anchor.java graal/GraalCompiler/src/com/sun/c1x/ir/ArithmeticOp.java graal/GraalCompiler/src/com/sun/c1x/ir/ArrayLength.java graal/GraalCompiler/src/com/sun/c1x/ir/CheckCast.java graal/GraalCompiler/src/com/sun/c1x/ir/CompareOp.java graal/GraalCompiler/src/com/sun/c1x/ir/Constant.java graal/GraalCompiler/src/com/sun/c1x/ir/Convert.java graal/GraalCompiler/src/com/sun/c1x/ir/Deoptimize.java graal/GraalCompiler/src/com/sun/c1x/ir/ExceptionDispatch.java graal/GraalCompiler/src/com/sun/c1x/ir/ExceptionObject.java graal/GraalCompiler/src/com/sun/c1x/ir/If.java graal/GraalCompiler/src/com/sun/c1x/ir/IfOp.java graal/GraalCompiler/src/com/sun/c1x/ir/InstanceOf.java graal/GraalCompiler/src/com/sun/c1x/ir/Invoke.java graal/GraalCompiler/src/com/sun/c1x/ir/LoadField.java graal/GraalCompiler/src/com/sun/c1x/ir/LoadIndexed.java graal/GraalCompiler/src/com/sun/c1x/ir/Local.java graal/GraalCompiler/src/com/sun/c1x/ir/LogicOp.java graal/GraalCompiler/src/com/sun/c1x/ir/LookupSwitch.java graal/GraalCompiler/src/com/sun/c1x/ir/LoopBegin.java graal/GraalCompiler/src/com/sun/c1x/ir/LoopEnd.java graal/GraalCompiler/src/com/sun/c1x/ir/Merge.java graal/GraalCompiler/src/com/sun/c1x/ir/MonitorAddress.java graal/GraalCompiler/src/com/sun/c1x/ir/MonitorEnter.java graal/GraalCompiler/src/com/sun/c1x/ir/MonitorExit.java graal/GraalCompiler/src/com/sun/c1x/ir/NegateOp.java graal/GraalCompiler/src/com/sun/c1x/ir/NewArray.java graal/GraalCompiler/src/com/sun/c1x/ir/NewInstance.java graal/GraalCompiler/src/com/sun/c1x/ir/NewMultiArray.java graal/GraalCompiler/src/com/sun/c1x/ir/NewObjectArray.java graal/GraalCompiler/src/com/sun/c1x/ir/NewTypeArray.java graal/GraalCompiler/src/com/sun/c1x/ir/NullCheck.java graal/GraalCompiler/src/com/sun/c1x/ir/Phi.java graal/GraalCompiler/src/com/sun/c1x/ir/Placeholder.java graal/GraalCompiler/src/com/sun/c1x/ir/RegisterFinalizer.java graal/GraalCompiler/src/com/sun/c1x/ir/Return.java graal/GraalCompiler/src/com/sun/c1x/ir/ShiftOp.java graal/GraalCompiler/src/com/sun/c1x/ir/StoreField.java graal/GraalCompiler/src/com/sun/c1x/ir/StoreIndexed.java graal/GraalCompiler/src/com/sun/c1x/ir/TableSwitch.java graal/GraalCompiler/src/com/sun/c1x/ir/Unwind.java graal/GraalCompiler/src/com/sun/c1x/ir/Value.java graal/GraalCompiler/src/com/sun/c1x/value/FrameState.java graal/GraalCompiler/src/com/sun/c1x/value/FrameStateBuilder.java graal/GraalGraph/src/com/oracle/graal/graph/NodeArray.java graal/GraalGraph/src/com/oracle/graal/graph/StartNode.java
diffstat 47 files changed, 6 insertions(+), 73 deletions(-) [+]
line wrap: on
line diff
--- a/graal/GraalCompiler/src/com/sun/c1x/gen/LIRGenerator.java	Tue Jun 07 11:19:01 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/gen/LIRGenerator.java	Tue Jun 07 11:36:32 2011 +0200
@@ -1589,10 +1589,6 @@
         }
 
         public boolean isNonNull(XirArgument argument) {
-            if (argument.constant == null && argument.object instanceof LIRItem) {
-                // check the flag on the original value
-                return ((LIRItem) argument.object).instruction.isNonNull();
-            }
             return false;
         }
 
--- a/graal/GraalCompiler/src/com/sun/c1x/ir/Anchor.java	Tue Jun 07 11:19:01 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/ir/Anchor.java	Tue Jun 07 11:36:32 2011 +0200
@@ -58,7 +58,6 @@
     @Override
     public Node copy(Graph into) {
         Anchor x = new Anchor(null, into);
-        x.setNonNull(isNonNull());
         return x;
     }
 }
--- a/graal/GraalCompiler/src/com/sun/c1x/ir/ArithmeticOp.java	Tue Jun 07 11:19:01 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/ir/ArithmeticOp.java	Tue Jun 07 11:36:32 2011 +0200
@@ -83,7 +83,6 @@
     @Override
     public Node copy(Graph into) {
         ArithmeticOp x = new ArithmeticOp(opcode, kind, null, null, isStrictFP, canTrap, into);
-        x.setNonNull(isNonNull());
         return x;
     }
 }
--- a/graal/GraalCompiler/src/com/sun/c1x/ir/ArrayLength.java	Tue Jun 07 11:19:01 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/ir/ArrayLength.java	Tue Jun 07 11:36:32 2011 +0200
@@ -96,7 +96,6 @@
     @Override
     public Node copy(Graph into) {
         ArrayLength x = new ArrayLength(null, into);
-        x.setNonNull(isNonNull());
         return x;
     }
 }
--- a/graal/GraalCompiler/src/com/sun/c1x/ir/CheckCast.java	Tue Jun 07 11:19:01 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/ir/CheckCast.java	Tue Jun 07 11:36:32 2011 +0200
@@ -46,7 +46,6 @@
      */
     public CheckCast(RiType targetClass, Value targetClassInstruction, Value object, Graph graph) {
         super(targetClass, targetClassInstruction, object, CiKind.Object, INPUT_COUNT, SUCCESSOR_COUNT, graph);
-        setNonNull(true);
     }
 
     /**
@@ -99,7 +98,6 @@
     @Override
     public Node copy(Graph into) {
         CheckCast x = new CheckCast(targetClass, null, null, into);
-        x.setNonNull(isNonNull());
         return x;
     }
 }
--- a/graal/GraalCompiler/src/com/sun/c1x/ir/CompareOp.java	Tue Jun 07 11:19:01 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/ir/CompareOp.java	Tue Jun 07 11:36:32 2011 +0200
@@ -63,7 +63,6 @@
     @Override
     public Node copy(Graph into) {
         CompareOp x = new CompareOp(opcode, kind, null, null, into);
-        x.setNonNull(isNonNull());
         return x;
     }
 }
--- a/graal/GraalCompiler/src/com/sun/c1x/ir/Constant.java	Tue Jun 07 11:19:01 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/ir/Constant.java	Tue Jun 07 11:36:32 2011 +0200
@@ -48,7 +48,6 @@
     public Constant(CiConstant value, Graph graph) {
         super(value.kind.stackKind(), INPUT_COUNT, SUCCESSOR_COUNT, graph);
         this.value = value;
-        setNonNull(true);
     }
 
     @Override
@@ -195,7 +194,6 @@
     @Override
     public Node copy(Graph into) {
         Constant x = new Constant(value, into);
-        x.setNonNull(isNonNull());
         return x;
     }
 }
--- a/graal/GraalCompiler/src/com/sun/c1x/ir/Convert.java	Tue Jun 07 11:19:01 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/ir/Convert.java	Tue Jun 07 11:36:32 2011 +0200
@@ -104,7 +104,6 @@
     @Override
     public Node copy(Graph into) {
         Convert x = new Convert(opcode, null, kind, into);
-        x.setNonNull(isNonNull());
         return x;
     }
 }
--- a/graal/GraalCompiler/src/com/sun/c1x/ir/Deoptimize.java	Tue Jun 07 11:19:01 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/ir/Deoptimize.java	Tue Jun 07 11:36:32 2011 +0200
@@ -64,7 +64,6 @@
     public Node copy(Graph into) {
         Deoptimize x = new Deoptimize(into);
         x.setMessage(message);
-        x.setNonNull(isNonNull());
         return x;
     }
 }
--- a/graal/GraalCompiler/src/com/sun/c1x/ir/ExceptionDispatch.java	Tue Jun 07 11:19:01 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/ir/ExceptionDispatch.java	Tue Jun 07 11:36:32 2011 +0200
@@ -128,7 +128,6 @@
     @Override
     public Node copy(Graph into) {
         ExceptionDispatch x = new ExceptionDispatch(null, null, null, catchType, into);
-        x.setNonNull(isNonNull());
         return x;
     }
 }
--- a/graal/GraalCompiler/src/com/sun/c1x/ir/ExceptionObject.java	Tue Jun 07 11:19:01 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/ir/ExceptionObject.java	Tue Jun 07 11:36:32 2011 +0200
@@ -41,7 +41,6 @@
      */
     public ExceptionObject(Graph graph) {
         super(CiKind.Object, INPUT_COUNT, SUCCESSOR_COUNT, graph);
-        setNonNull(true);
     }
 
     @Override
@@ -57,7 +56,6 @@
     @Override
     public Node copy(Graph into) {
         ExceptionObject x = new ExceptionObject(into);
-        x.setNonNull(isNonNull());
         return x;
     }
 }
--- a/graal/GraalCompiler/src/com/sun/c1x/ir/If.java	Tue Jun 07 11:19:01 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/ir/If.java	Tue Jun 07 11:36:32 2011 +0200
@@ -190,7 +190,6 @@
     public Node copy(Graph into) {
         If x = new If(null, condition, null, into);
         x.unorderedIsTrue = unorderedIsTrue;
-        x.setNonNull(isNonNull());
         return x;
     }
 }
--- a/graal/GraalCompiler/src/com/sun/c1x/ir/IfOp.java	Tue Jun 07 11:19:01 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/ir/IfOp.java	Tue Jun 07 11:36:32 2011 +0200
@@ -150,7 +150,6 @@
     @Override
     public Node copy(Graph into) {
         IfOp x = new IfOp(kind, condition, into);
-        x.setNonNull(isNonNull());
         return x;
     }
 }
--- a/graal/GraalCompiler/src/com/sun/c1x/ir/InstanceOf.java	Tue Jun 07 11:19:01 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/ir/InstanceOf.java	Tue Jun 07 11:36:32 2011 +0200
@@ -74,7 +74,6 @@
     @Override
     public Node copy(Graph into) {
         InstanceOf x = new InstanceOf(targetClass, null, null, into);
-        x.setNonNull(isNonNull());
         return x;
     }
 }
--- a/graal/GraalCompiler/src/com/sun/c1x/ir/Invoke.java	Tue Jun 07 11:19:01 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/ir/Invoke.java	Tue Jun 07 11:36:32 2011 +0200
@@ -197,7 +197,6 @@
     @Override
     public Node copy(Graph into) {
         Invoke x = new Invoke(bci, opcode, kind, new Value[argumentCount], target, returnType, into);
-        x.setNonNull(isNonNull());
         return x;
     }
 }
--- a/graal/GraalCompiler/src/com/sun/c1x/ir/LoadField.java	Tue Jun 07 11:19:01 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/ir/LoadField.java	Tue Jun 07 11:36:32 2011 +0200
@@ -92,7 +92,6 @@
     @Override
     public Node copy(Graph into) {
         LoadField x = new LoadField(null, field, into);
-        x.setNonNull(isNonNull());
         return x;
     }
 }
--- a/graal/GraalCompiler/src/com/sun/c1x/ir/LoadIndexed.java	Tue Jun 07 11:19:01 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/ir/LoadIndexed.java	Tue Jun 07 11:36:32 2011 +0200
@@ -88,7 +88,6 @@
     @Override
     public Node copy(Graph into) {
         LoadIndexed x = new LoadIndexed(null, null, null, elementKind(), into);
-        x.setNonNull(isNonNull());
         return x;
     }
 }
--- a/graal/GraalCompiler/src/com/sun/c1x/ir/Local.java	Tue Jun 07 11:19:01 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/ir/Local.java	Tue Jun 07 11:36:32 2011 +0200
@@ -94,7 +94,6 @@
     public Node copy(Graph into) {
         Local x = new Local(kind, index, into);
         x.setDeclaredType(declaredType());
-        x.setNonNull(isNonNull());
         return x;
     }
 }
--- a/graal/GraalCompiler/src/com/sun/c1x/ir/LogicOp.java	Tue Jun 07 11:19:01 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/ir/LogicOp.java	Tue Jun 07 11:36:32 2011 +0200
@@ -63,7 +63,6 @@
     @Override
     public Node copy(Graph into) {
         LogicOp x = new LogicOp(kind, opcode, into);
-        x.setNonNull(isNonNull());
         return x;
     }
 }
--- a/graal/GraalCompiler/src/com/sun/c1x/ir/LookupSwitch.java	Tue Jun 07 11:19:01 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/ir/LookupSwitch.java	Tue Jun 07 11:36:32 2011 +0200
@@ -87,7 +87,6 @@
     @Override
     public Node copy(Graph into) {
         LookupSwitch x = new LookupSwitch(null, Arrays.asList(new Instruction[numberOfCases() + 1]), keys.clone(), into);
-        x.setNonNull(isNonNull());
         return x;
     }
 }
--- a/graal/GraalCompiler/src/com/sun/c1x/ir/LoopBegin.java	Tue Jun 07 11:19:01 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/ir/LoopBegin.java	Tue Jun 07 11:36:32 2011 +0200
@@ -65,7 +65,6 @@
     @Override
     public Node copy(Graph into) {
         LoopBegin x = new LoopBegin(into);
-        x.setNonNull(isNonNull());
         return x;
     }
 }
--- a/graal/GraalCompiler/src/com/sun/c1x/ir/LoopEnd.java	Tue Jun 07 11:19:01 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/ir/LoopEnd.java	Tue Jun 07 11:36:32 2011 +0200
@@ -76,7 +76,6 @@
     @Override
     public Node copy(Graph into) {
         LoopEnd x = new LoopEnd(into);
-        x.setNonNull(isNonNull());
         return x;
     }
 }
--- a/graal/GraalCompiler/src/com/sun/c1x/ir/Merge.java	Tue Jun 07 11:19:01 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/ir/Merge.java	Tue Jun 07 11:36:32 2011 +0200
@@ -264,7 +264,6 @@
     public Node copy(Graph into) {
         assert getClass() == Merge.class : "copy of " + getClass();
         Merge x = new Merge(into);
-        x.setNonNull(isNonNull());
         return x;
     }
 
--- a/graal/GraalCompiler/src/com/sun/c1x/ir/MonitorAddress.java	Tue Jun 07 11:19:01 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/ir/MonitorAddress.java	Tue Jun 07 11:36:32 2011 +0200
@@ -39,7 +39,6 @@
     public MonitorAddress(int monitor, Graph graph) {
         super(CiKind.Word, INPUT_COUNT, SUCCESSOR_COUNT, graph);
         this.monitor = monitor;
-        setNonNull(true);
     }
 
     @Override
@@ -59,7 +58,6 @@
     @Override
     public Node copy(Graph into) {
         MonitorAddress x = new MonitorAddress(monitor, into);
-        x.setNonNull(isNonNull());
         return x;
     }
 }
--- a/graal/GraalCompiler/src/com/sun/c1x/ir/MonitorEnter.java	Tue Jun 07 11:19:01 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/ir/MonitorEnter.java	Tue Jun 07 11:36:32 2011 +0200
@@ -64,7 +64,6 @@
     @Override
     public Node copy(Graph into) {
         MonitorEnter x = new MonitorEnter(null, null, lockNumber, into);
-        x.setNonNull(isNonNull());
         return x;
     }
 }
--- a/graal/GraalCompiler/src/com/sun/c1x/ir/MonitorExit.java	Tue Jun 07 11:19:01 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/ir/MonitorExit.java	Tue Jun 07 11:36:32 2011 +0200
@@ -58,7 +58,6 @@
     @Override
     public Node copy(Graph into) {
         MonitorExit x = new MonitorExit(null, null, lockNumber, into);
-        x.setNonNull(isNonNull());
         return x;
     }
 }
--- a/graal/GraalCompiler/src/com/sun/c1x/ir/NegateOp.java	Tue Jun 07 11:19:01 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/ir/NegateOp.java	Tue Jun 07 11:36:32 2011 +0200
@@ -101,7 +101,6 @@
     @Override
     public Node copy(Graph into) {
         NegateOp x = new NegateOp(kind, into);
-        x.setNonNull(isNonNull());
         return x;
     }
 }
--- a/graal/GraalCompiler/src/com/sun/c1x/ir/NewArray.java	Tue Jun 07 11:19:01 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/ir/NewArray.java	Tue Jun 07 11:36:32 2011 +0200
@@ -66,7 +66,6 @@
      */
     NewArray(Value length, int inputCount, int successorCount, Graph graph) {
         super(CiKind.Object, inputCount + INPUT_COUNT, successorCount + SUCCESSOR_COUNT, graph);
-        setNonNull(true);
         setLength(length);
     }
 }
--- a/graal/GraalCompiler/src/com/sun/c1x/ir/NewInstance.java	Tue Jun 07 11:19:01 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/ir/NewInstance.java	Tue Jun 07 11:36:32 2011 +0200
@@ -51,7 +51,6 @@
         this.instanceClass = type;
         this.cpi = cpi;
         this.constantPool = constantPool;
-        setNonNull(true);
     }
 
     /**
@@ -85,7 +84,6 @@
     @Override
     public Node copy(Graph into) {
         NewInstance x = new NewInstance(instanceClass, cpi, constantPool, into);
-        x.setNonNull(isNonNull());
         return x;
     }
 }
--- a/graal/GraalCompiler/src/com/sun/c1x/ir/NewMultiArray.java	Tue Jun 07 11:19:01 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/ir/NewMultiArray.java	Tue Jun 07 11:36:32 2011 +0200
@@ -120,7 +120,6 @@
     @Override
     public Node copy(Graph into) {
         NewMultiArray x = new NewMultiArray(elementType, new Value[dimensionCount], cpi, constantPool, into);
-        x.setNonNull(isNonNull());
         return x;
     }
 }
--- a/graal/GraalCompiler/src/com/sun/c1x/ir/NewObjectArray.java	Tue Jun 07 11:19:01 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/ir/NewObjectArray.java	Tue Jun 07 11:36:32 2011 +0200
@@ -79,7 +79,6 @@
     @Override
     public Node copy(Graph into) {
         NewObjectArray x = new NewObjectArray(elementClass, null, into);
-        x.setNonNull(isNonNull());
         return x;
     }
 }
--- a/graal/GraalCompiler/src/com/sun/c1x/ir/NewTypeArray.java	Tue Jun 07 11:19:01 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/ir/NewTypeArray.java	Tue Jun 07 11:36:32 2011 +0200
@@ -69,7 +69,6 @@
     @Override
     public Node copy(Graph into) {
         NewTypeArray x = new NewTypeArray(null, elementType, into);
-        x.setNonNull(isNonNull());
         return x;
     }
 }
--- a/graal/GraalCompiler/src/com/sun/c1x/ir/NullCheck.java	Tue Jun 07 11:19:01 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/ir/NullCheck.java	Tue Jun 07 11:36:32 2011 +0200
@@ -68,14 +68,12 @@
      */
     public NullCheck(Value object, Graph graph) {
         super(object.kind, INPUT_COUNT, SUCCESSOR_COUNT, graph);
-        setNonNull(true);
         setObject(object);
     }
 
     // for copying
     private NullCheck(CiKind kind, Graph graph) {
         super(kind, INPUT_COUNT, SUCCESSOR_COUNT, graph);
-        setNonNull(true);
     }
 
     @Override
@@ -117,7 +115,6 @@
     @Override
     public Node copy(Graph into) {
         NullCheck x = new NullCheck(kind, into);
-        x.setNonNull(isNonNull());
         return x;
     }
 }
--- a/graal/GraalCompiler/src/com/sun/c1x/ir/Phi.java	Tue Jun 07 11:19:01 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/ir/Phi.java	Tue Jun 07 11:36:32 2011 +0200
@@ -169,7 +169,6 @@
         Phi x = new Phi(kind, null, maxValues, into);
         x.usedInputCount = usedInputCount;
         x.isDead = isDead;
-        x.setNonNull(isNonNull());
         return x;
     }
 }
--- a/graal/GraalCompiler/src/com/sun/c1x/ir/Placeholder.java	Tue Jun 07 11:19:01 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/ir/Placeholder.java	Tue Jun 07 11:36:32 2011 +0200
@@ -65,7 +65,6 @@
     @Override
     public Node copy(Graph into) {
         Placeholder x = new Placeholder(into);
-        x.setNonNull(isNonNull());
         return x;
     }
 }
--- a/graal/GraalCompiler/src/com/sun/c1x/ir/RegisterFinalizer.java	Tue Jun 07 11:19:01 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/ir/RegisterFinalizer.java	Tue Jun 07 11:36:32 2011 +0200
@@ -77,7 +77,6 @@
     @Override
     public Node copy(Graph into) {
         RegisterFinalizer x = new RegisterFinalizer(null, null, into);
-        x.setNonNull(isNonNull());
         return x;
     }
 }
--- a/graal/GraalCompiler/src/com/sun/c1x/ir/Return.java	Tue Jun 07 11:19:01 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/ir/Return.java	Tue Jun 07 11:36:32 2011 +0200
@@ -96,7 +96,6 @@
     @Override
     public Node copy(Graph into) {
         Return x = new Return(kind, into);
-        x.setNonNull(isNonNull());
         return x;
     }
 }
--- a/graal/GraalCompiler/src/com/sun/c1x/ir/ShiftOp.java	Tue Jun 07 11:19:01 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/ir/ShiftOp.java	Tue Jun 07 11:36:32 2011 +0200
@@ -62,7 +62,6 @@
     @Override
     public Node copy(Graph into) {
         ShiftOp x = new ShiftOp(kind, opcode, into);
-        x.setNonNull(isNonNull());
         return x;
     }
 }
--- a/graal/GraalCompiler/src/com/sun/c1x/ir/StoreField.java	Tue Jun 07 11:19:01 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/ir/StoreField.java	Tue Jun 07 11:36:32 2011 +0200
@@ -90,7 +90,6 @@
     @Override
     public Node copy(Graph into) {
         StoreField x = new StoreField(null, field, null, into);
-        x.setNonNull(isNonNull());
         return x;
     }
 }
--- a/graal/GraalCompiler/src/com/sun/c1x/ir/StoreIndexed.java	Tue Jun 07 11:19:01 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/ir/StoreIndexed.java	Tue Jun 07 11:36:32 2011 +0200
@@ -85,7 +85,6 @@
     @Override
     public Node copy(Graph into) {
         StoreIndexed x = new StoreIndexed(null, null, null, elementKind(), null, into);
-        x.setNonNull(isNonNull());
         return x;
     }
 }
--- a/graal/GraalCompiler/src/com/sun/c1x/ir/TableSwitch.java	Tue Jun 07 11:19:01 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/ir/TableSwitch.java	Tue Jun 07 11:36:32 2011 +0200
@@ -89,7 +89,6 @@
     @Override
     public Node copy(Graph into) {
         TableSwitch x = new TableSwitch(null, Arrays.asList(new Instruction[numberOfCases() + 1]), lowKey, into);
-        x.setNonNull(isNonNull());
         return x;
     }
 }
--- a/graal/GraalCompiler/src/com/sun/c1x/ir/Unwind.java	Tue Jun 07 11:19:01 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/ir/Unwind.java	Tue Jun 07 11:36:32 2011 +0200
@@ -81,7 +81,6 @@
     @Override
     public Node copy(Graph into) {
         Unwind x = new Unwind(null, into);
-        x.setNonNull(isNonNull());
         return x;
     }
 }
--- a/graal/GraalCompiler/src/com/sun/c1x/ir/Value.java	Tue Jun 07 11:19:01 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/ir/Value.java	Tue Jun 07 11:36:32 2011 +0200
@@ -41,8 +41,6 @@
      */
     public final CiKind kind;
 
-    private boolean isNonNull;
-
     protected CiValue operand = CiValue.IllegalValue;
 
     /**
@@ -67,18 +65,6 @@
     }
 
     /**
-     * Checks whether this instruction produces a value which is guaranteed to be non-null.
-     * @return {@code true} if this instruction's value is not null
-     */
-    public boolean isNonNull() {
-        return isNonNull;
-    }
-
-    public void setNonNull(boolean isNonNull) {
-        this.isNonNull = isNonNull;
-    }
-
-    /**
      * Checks whether this value is a constant (i.e. it is of type {@link Constant}.
      * @return {@code true} if this value is a constant
      */
@@ -177,9 +163,6 @@
 
     public String flagsToString() {
         StringBuilder sb = new StringBuilder();
-        if (isNonNull()) {
-            sb.append("NonNull");
-        }
         return sb.toString();
     }
 
@@ -219,7 +202,6 @@
     public Map<Object, Object> getDebugProperties() {
         Map<Object, Object> properties = super.getDebugProperties();
         properties.put("kind", kind.toString());
-        properties.put("nonNull", isNonNull);
         properties.put("operand", operand == null ? "null" : operand.toString());
         return properties;
     }
--- a/graal/GraalCompiler/src/com/sun/c1x/value/FrameState.java	Tue Jun 07 11:19:01 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/value/FrameState.java	Tue Jun 07 11:36:32 2011 +0200
@@ -511,7 +511,6 @@
     @Override
     public Node copy(Graph into) {
         FrameState x = new FrameState(method, bci, localsSize, stackSize, locksSize, into);
-        x.setNonNull(isNonNull());
         return x;
     }
 }
--- a/graal/GraalCompiler/src/com/sun/c1x/value/FrameStateBuilder.java	Tue Jun 07 11:19:01 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/value/FrameStateBuilder.java	Tue Jun 07 11:36:32 2011 +0200
@@ -57,7 +57,6 @@
             // add the receiver and assume it is non null
             Local local = new Local(method.holder().kind(), javaIndex, graph);
             local.inputs().set(0, graph.start());
-            local.setNonNull(true);
             local.setDeclaredType(method.holder());
             storeLocal(javaIndex, local);
             javaIndex = 1;
--- a/graal/GraalGraph/src/com/oracle/graal/graph/NodeArray.java	Tue Jun 07 11:19:01 2011 +0200
+++ b/graal/GraalGraph/src/com/oracle/graal/graph/NodeArray.java	Tue Jun 07 11:36:32 2011 +0200
@@ -36,6 +36,7 @@
         this.nodes = new Node[length];
     }
 
+    @Override
     public Iterator<Node> iterator() {
         return Arrays.asList(this.nodes).iterator();
     }
@@ -44,6 +45,7 @@
         return this.node;
     }
 
+    @Override
     public Node set(int index, Node node) {
         assert node == Node.Null || node.graph == self().graph;
         assert node == Node.Null || node.id() != Node.DeletedID : "inserted node must not be deleted";
@@ -86,10 +88,12 @@
         }
     }
 
+    @Override
     public Node get(int index) {
         return nodes[index];
     }
 
+    @Override
     public Node[] toArray() {
         return Arrays.copyOf(nodes, nodes.length);
     }
@@ -133,6 +137,7 @@
         assert false;
     }
 
+    @Override
     public int size() {
         return nodes.length;
     }
--- a/graal/GraalGraph/src/com/oracle/graal/graph/StartNode.java	Tue Jun 07 11:19:01 2011 +0200
+++ b/graal/GraalGraph/src/com/oracle/graal/graph/StartNode.java	Tue Jun 07 11:36:32 2011 +0200
@@ -40,7 +40,7 @@
     }
 
     public Node start() {
-        return (Node) successors().get(super.successorCount() + SUCCESSOR_START);
+        return successors().get(super.successorCount() + SUCCESSOR_START);
     }
 
     public Node setStart(Node next) {