Mercurial > hg > graal-compiler

changeset 22417:a372c8271ea4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
do not replace "non-replaceable" FrameStates with null in PE graph decoding
author Lukas Stadler <lukas.stadler@oracle.com>
date Mon, 10 Aug 2015 15:57:05 +0200
parents 6fb1e5669ea5
children d003c4c1782b
files graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/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/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) {