Mercurial > hg > graal-compiler

changeset 8469:718c0304ffeb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix for polymorphic inlining after fusing exception obecjt and the distaptch begin
author Gilles Duboscq <duboscq@ssw.jku.at>
date Tue, 26 Mar 2013 12:16:35 +0100
parents 95e21e035363
children 5d102046a730 056966f39a36
files graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/InliningUtil.java
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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