# HG changeset patch
# User Lukas Stadler <lukas.stadler@jku.at>
# Date 1357901051 -3600
# Node ID 4e25ceefee4c2ef9fdae300001c039e0960c9006
# Parent  501d254a0a3dab40fe3e9ad3041346e7bfd8ddda
more specific return value on ObjectStamp.join

diff -r 501d254a0a3d -r 4e25ceefee4c graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/type/ObjectStamp.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/type/ObjectStamp.java	Fri Jan 11 11:38:56 2013 +0100
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/type/ObjectStamp.java	Fri Jan 11 11:44:11 2013 +0100
@@ -128,7 +128,7 @@
     }
 
     @Override
-    public Stamp join(Stamp otherStamp) {
+    public ObjectStamp join(Stamp otherStamp) {
         if (this == otherStamp) {
             return this;
         }