# HG changeset patch
# User Lukas Stadler <lukas.stadler@jku.at>
# Date 1336744751 -7200
# Node ID f66a1ed4562a4de09e201b84de187ad041b2f65d
# Parent  612b4f09936284660cdf728f2862835a61b2c744
let StampFactory.orTypes use RiResolvedType.leastCommonAncestor

diff -r 612b4f099362 -r f66a1ed4562a graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/type/StampFactory.java
--- 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);
         }
     }
 }