diff graal/com.oracle.graal.nodes.test/src/com/oracle/graal/nodes/test/ObjectStampJoinTest.java @ 18490:ca81508f2a19

Generalize NULL handling to work on arbitrary pointers.
author Roland Schatz <roland.schatz@oracle.com>
date Mon, 24 Nov 2014 13:53:14 +0100
parents 0c6504598b65
children 35e1b66f2810
line wrap: on
line diff
--- a/graal/com.oracle.graal.nodes.test/src/com/oracle/graal/nodes/test/ObjectStampJoinTest.java	Mon Nov 24 13:20:02 2014 +0100
+++ b/graal/com.oracle.graal.nodes.test/src/com/oracle/graal/nodes/test/ObjectStampJoinTest.java	Mon Nov 24 13:53:14 2014 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -63,7 +63,7 @@
     public void testJoin3() {
         Stamp d = StampFactory.declared(getType(D.class));
         Stamp c = StampFactory.declared(getType(C.class));
-        Assert.assertTrue(StampTool.isObjectAlwaysNull(join(c, d)));
+        Assert.assertTrue(StampTool.isPointerAlwaysNull(join(c, d)));
     }
 
     @Test
@@ -78,7 +78,7 @@
         Stamp dExact = StampFactory.exact(getType(D.class));
         Stamp c = StampFactory.declared(getType(C.class));
         Stamp join = join(c, dExact);
-        Assert.assertTrue(StampTool.isObjectAlwaysNull(join));
+        Assert.assertTrue(StampTool.isPointerAlwaysNull(join));
         Assert.assertNull(StampTool.typeOrNull(join));
         Assert.assertFalse(StampTool.isExactType(join));
     }
@@ -89,8 +89,8 @@
         Stamp alwaysNull = StampFactory.alwaysNull();
         Stamp join = join(alwaysNull, dExactNonNull);
         Assert.assertFalse(join.isLegal());
-        Assert.assertFalse(StampTool.isObjectNonNull(join));
-        Assert.assertFalse(StampTool.isObjectAlwaysNull(join));
+        Assert.assertFalse(StampTool.isPointerNonNull(join));
+        Assert.assertFalse(StampTool.isPointerAlwaysNull(join));
     }
 
     @Test
@@ -98,7 +98,7 @@
         Stamp aExact = StampFactory.exact(getType(A.class));
         Stamp e = StampFactory.declared(getType(E.class));
         Stamp join = join(aExact, e);
-        Assert.assertTrue(StampTool.isObjectAlwaysNull(join));
+        Assert.assertTrue(StampTool.isPointerAlwaysNull(join));
         Assert.assertNull(StampTool.typeOrNull(join));
         Assert.assertFalse(StampTool.isExactType(join));
     }
@@ -116,7 +116,7 @@
         Stamp bExact = StampFactory.exact(getType(B.class));
         Stamp dExact = StampFactory.exact(getType(D.class));
         Stamp join = join(bExact, dExact);
-        Assert.assertTrue(StampTool.isObjectAlwaysNull(join));
+        Assert.assertTrue(StampTool.isPointerAlwaysNull(join));
         Assert.assertNull(StampTool.typeOrNull(join));
         Assert.assertNull(StampTool.typeOrNull(join));
     }