# HG changeset patch
# User Doug Simon <doug.simon@oracle.com>
# Date 1380746796 -7200
# Node ID e602861c3f7dc18923872be066a8d347833beabe
# Parent  008500ebc6c67d3f906d0d85753df240aba51b8e# Parent  39e9ec0cf310638da6932f8199bdbc609e9a75be
Merge.

diff -r 008500ebc6c6 -r e602861c3f7d 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	Wed Oct 02 21:43:19 2013 +0200
+++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/InliningUtil.java	Wed Oct 02 22:46:36 2013 +0200
@@ -1363,6 +1363,13 @@
             } else {
                 invokeWithException.killExceptionEdge();
             }
+
+            // get rid of memory kill
+            AbstractBeginNode begin = invokeWithException.next();
+            if (begin instanceof KillingBeginNode) {
+                graph.addAfterFixed(begin, graph.add(new BeginNode()));
+                graph.removeFixed(begin);
+            }
         } else {
             if (unwindNode != null) {
                 UnwindNode unwindDuplicate = (UnwindNode) duplicates.get(unwindNode);