Mercurial > hg > graal-compiler

changeset 23049:7d3aa3ffb20c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Tweak assertion to not fail when high-level graph already has fixed deoptimizations
author Christian Wimmer <christian.wimmer@oracle.com>
date Sat, 21 Nov 2015 09:24:04 -0800
parents 4929b9470674
children cc904fd7b454
files graal/com.oracle.graal.phases/src/com/oracle/graal/phases/schedule/SchedulePhase.java
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/schedule/SchedulePhase.java	Sat Nov 21 09:23:11 2015 -0800
+++ b/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/schedule/SchedulePhase.java	Sat Nov 21 09:24:04 2015 -0800
@@ -62,6 +62,7 @@
 import com.oracle.graal.nodes.StructuredGraph;
 import com.oracle.graal.nodes.ValueNode;
 import com.oracle.graal.nodes.VirtualState;
+import com.oracle.graal.nodes.StructuredGraph.GuardsStage;
 import com.oracle.graal.nodes.cfg.Block;
 import com.oracle.graal.nodes.cfg.ControlFlowGraph;
 import com.oracle.graal.nodes.cfg.HIRLoop;
@@ -277,7 +278,7 @@
                 assert n.isAlive();
                 assert nodeMap.get(n) == b;
                 StructuredGraph g = (StructuredGraph) n.graph();
-                if (g.hasLoops() && g.getGuardsStage().areDeoptsFixed() && n instanceof DeoptimizeNode) {
+                if (g.hasLoops() && g.getGuardsStage() == GuardsStage.AFTER_FSA && n instanceof DeoptimizeNode) {
                     assert b.getLoopDepth() == 0 : n;
                 }
             }