Mercurial > hg > truffle

changeset 5390:f66a1ed4562a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
let StampFactory.orTypes use RiResolvedType.leastCommonAncestor
author Lukas Stadler <lukas.stadler@jku.at>
date Fri, 11 May 2012 15:59:11 +0200
parents 612b4f099362
children 5097f21f6c2b
files graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/type/StampFactory.java
diffstat 1 files changed, 1 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/type/StampFactory.java	Fri May 11 15:26:46 2012 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/type/StampFactory.java	Fri May 11 15:59:11 2012 +0200
@@ -278,13 +278,7 @@
         } else if (a == null || b == null) {
             return null;
         } else {
-            if (a.isSubtypeOf(b)) {
-                return b;
-            } else if (b.isSubtypeOf(a)) {
-                return a;
-            } else {
-                return null;
-            }
+            return a.leastCommonAncestor(b);
         }
     }
 }