# HG changeset patch
# User Gilles Duboscq <duboscq@ssw.jku.at>
# Date 1336126085 -7200
# Node ID eafa1f3ad48f857af6cd00a3e6bc36446d209d1f
# Parent  a704936a25b727dcb05888aec18a60af2a3cc5d5
Add verification in NullCheckNode and AccessFieldNode
Remove useless debug properties from IsTypeNode

diff -r a704936a25b7 -r eafa1f3ad48f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/NullCheckNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/NullCheckNode.java	Fri May 04 12:08:00 2012 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/NullCheckNode.java	Fri May 04 12:08:05 2012 +0200
@@ -61,6 +61,7 @@
 
     @Override
     public boolean verify() {
+        assertTrue(object() != null, "null check input must not be null");
         assertTrue(object().kind().isObject(), "null check input must be an object");
         return super.verify();
     }
diff -r a704936a25b7 -r eafa1f3ad48f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/AccessFieldNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/AccessFieldNode.java	Fri May 04 12:08:00 2012 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/AccessFieldNode.java	Fri May 04 12:08:05 2012 +0200
@@ -100,4 +100,10 @@
         debugProperties.put("field", CiUtil.format("%h.%n", field));
         return debugProperties;
     }
+
+    @Override
+    public boolean verify() {
+        assertTrue(object != null, "Access object can not be null");
+        return super.verify();
+    }
 }
diff -r a704936a25b7 -r eafa1f3ad48f graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/IsTypeNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/IsTypeNode.java	Fri May 04 12:08:00 2012 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/IsTypeNode.java	Fri May 04 12:08:05 2012 +0200
@@ -22,14 +22,12 @@
  */
 package com.oracle.graal.nodes.java;
 
-import java.util.*;
-
-import com.oracle.max.cri.ci.*;
-import com.oracle.max.cri.ri.*;
 import com.oracle.graal.nodes.*;
 import com.oracle.graal.nodes.extended.*;
 import com.oracle.graal.nodes.spi.*;
 import com.oracle.graal.nodes.type.*;
+import com.oracle.max.cri.ci.*;
+import com.oracle.max.cri.ri.*;
 
 public final class IsTypeNode extends BooleanNode implements Canonicalizable, LIRLowerable {
 
@@ -63,13 +61,6 @@
     }
 
     @Override
-    public Map<Object, Object> getDebugProperties() {
-        Map<Object, Object> properties = super.getDebugProperties();
-        properties.put("type", type);
-        return properties;
-    }
-
-    @Override
     public ValueNode canonical(CanonicalizerTool tool) {
         RiResolvedType exactType = objectClass() instanceof ReadHubNode ? ((ReadHubNode) objectClass()).object().exactType() : null;
         if (exactType != null) {