# HG changeset patch
# User Doug Simon <doug.simon@oracle.com>
# Date 1364302933 -3600
# Node ID 5d102046a7307aeb1db00687e554d5cacdc97971
# Parent  92571f3eeeeb92232ebd8255450166af0b3c6adb# Parent  718c0304ffeb32561439f103b894742b501f389d
Merge.

diff -r 92571f3eeeeb -r 5d102046a730 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	Tue Mar 26 14:00:16 2013 +0100
+++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/InliningUtil.java	Tue Mar 26 14:02:13 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