Mercurial > hg > truffle
changeset 15661:f6264f499455
correctly handle illegal stamps in ObjectStamp.meet
author | Lukas Stadler <lukas.stadler@oracle.com> |
---|---|
date | Thu, 15 May 2014 14:13:59 +0200 |
parents | 9c75a5e29052 |
children | 8d0242a07f7e |
files | graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/type/ObjectStamp.java |
diffstat | 1 files changed, 5 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- 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;