# HG changeset patch # User Bernhard Urban # Date 1389634647 -3600 # Node ID f9ee4532da8f86df8b7512b8fcddb81995a88d95 # Parent 6888c58b810b5a1e1dff56ee03fc02894ee89c01 MacroNode: fix case for macro node lowering if framestates are not removed diff -r 6888c58b810b -r f9ee4532da8f graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/MacroNode.java --- 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