Mercurial > hg > truffle

changeset 13617:f9ee4532da8f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
MacroNode: fix case for macro node lowering if framestates are not removed
author Bernhard Urban <bernhard.urban@jku.at>
date Mon, 13 Jan 2014 18:37:27 +0100
parents 6888c58b810b
children b87fcab6624a
files graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/MacroNode.java
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/MacroNode.java	Mon Jan 13 13:49:54 2014 +0100
+++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/MacroNode.java	Mon Jan 13 18:37:27 2014 +0100
@@ -87,7 +87,7 @@
     protected StructuredGraph getLoweredSubstitutionGraph(LoweringTool tool) {
         StructuredGraph methodSubstitution = tool.getReplacements().getMethodSubstitution(getTargetMethod());
         if (methodSubstitution != null) {
-            if (stateAfter() == null) {
+            if (stateAfter() == null || stateAfter().bci == FrameState.AFTER_BCI) {
                 /*
                  * handles the case of a MacroNode inside a snippet used for another MacroNode
                  * lowering