# HG changeset patch
# User Lukas Stadler <lukas.stadler@oracle.com>
# Date 1400156039 -7200
# Node ID f6264f499455cf86498d66856fcfec18707ffc8f
# Parent  9c75a5e29052780cbaa759d5bfc55124acf8a108
correctly handle illegal stamps in ObjectStamp.meet

diff -r 9c75a5e29052 -r f6264f499455 graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/type/ObjectStamp.java
--- a/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/type/ObjectStamp.java	Thu May 15 14:13:25 2014 +0200
+++ b/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/type/ObjectStamp.java	Thu May 15 14:13:59 2014 +0200
@@ -107,6 +107,11 @@
             return StampFactory.illegal(Kind.Illegal);
         }
         ObjectStamp other = (ObjectStamp) otherStamp;
+        if (!isLegal()) {
+            return other;
+        } else if (!other.isLegal()) {
+            return this;
+        }
         ResolvedJavaType meetType;
         boolean meetExactType;
         boolean meetNonNull;