# HG changeset patch
# User Gilles Duboscq <duboscq@ssw.jku.at>
# Date 1364296595 -3600
# Node ID 718c0304ffeb32561439f103b894742b501f389d
# Parent  95e21e0353635e76469671f634a8e0f93a3d12dc
Fix for polymorphic inlining after fusing exception obecjt and the distaptch begin

diff -r 95e21e035363 -r 718c0304ffeb graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/InliningUtil.java
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/InliningUtil.java	Mon Mar 25 22:38:05 2013 +0100
+++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/InliningUtil.java	Tue Mar 26 12:16:35 2013 +0100
@@ -456,7 +456,7 @@
                 FixedNode exceptionSux = exceptionEdge.next();
                 graph.addBeforeFixed(exceptionSux, exceptionMerge);
                 exceptionObjectPhi = graph.unique(new PhiNode(Kind.Object, exceptionMerge));
-                exceptionMerge.setStateAfter(exceptionEdge.stateAfter().duplicateModified(invoke.stateAfter().bci, true, Kind.Void, exceptionObjectPhi));
+                exceptionMerge.setStateAfter(exceptionEdge.stateAfter().duplicateModified(invoke.stateAfter().bci, true, Kind.Object, exceptionObjectPhi));
             }
 
             // create one separate block for each invoked method