Skip to content

Commit aa0b8b2

Browse files
committed
add stage flag for pr expand
1 parent 8cf5fb8 commit aa0b8b2

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/GraphState.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -625,6 +625,7 @@ public enum StageFlag {
625625
VECTOR_LOWERING,
626626
EXPAND_LOGIC,
627627
FIXED_READS,
628+
PARTIAL_REDUNDANCY_SCHEDULE,
628629
ADDRESS_LOWERING,
629630
FINAL_CANONICALIZATION,
630631
TARGET_VECTOR_LOWERING,

compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/CanonicalizerPhase.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -527,7 +527,9 @@ public static boolean gvn(Node node, NodeClass<?> nodeClass) {
527527
}
528528

529529
public boolean tryGlobalValueNumbering(Node node, NodeClass<?> nodeClass) {
530-
assert ((StructuredGraph) node.graph()).getGraphState().isBeforeStage(StageFlag.FIXED_READS) : "GVN must not occur after fixing reads, trying to gvn " + node + " for graph " + node.graph();
530+
assert ((StructuredGraph) node.graph()).getGraphState().isBeforeStage(StageFlag.PARTIAL_REDUNDANCY_SCHEDULE) : "GVN must not occur after expanding partially redundant nodes, trying to gvn " +
531+
node +
532+
" for graph " + node.graph();
531533
return gvn(node, nodeClass);
532534
}
533535

0 commit comments

Comments
 (0)