# HG changeset patch
# User Lukas Stadler <lukas.stadler@oracle.com>
# Date 1439215025 -7200
# Node ID a372c8271ea41678f72a75a2c7db26601b70bdc7
# Parent  6fb1e5669ea5d50bc131905d7a6538f70619730d
do not replace "non-replaceable" FrameStates with null in PE graph decoding

diff -r 6fb1e5669ea5 -r a372c8271ea4 graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/InliningUtil.java
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/InliningUtil.java	Mon Aug 10 14:50:50 2015 +0200
+++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/InliningUtil.java	Mon Aug 10 15:57:05 2015 +0200
@@ -590,7 +590,7 @@
                 }
             }
         }
-        return null;
+        return nonReplaceableFrameState;
     }
 
     public static ValueNode mergeReturns(AbstractMergeNode merge, List<? extends ReturnNode> returnNodes, List<Node> canonicalizedNodes) {