Mercurial > hg > truffle

comparison graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/ConvertDeoptimizeToGuardPhase.java @ 18995:a2cb19764970

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename MergeNode to AbstractMergeNode.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Wed, 28 Jan 2015 01:04:20 +0100
parents 480bd3b1adcd
children 8ab925a6f724
comparison
equal deleted inserted replaced
18994:8b4ef818169c 18995:a2cb19764970
67 } 67 }
68 68
69 for (FixedGuardNode fixedGuard : graph.getNodes(FixedGuardNode.class)) { 69 for (FixedGuardNode fixedGuard : graph.getNodes(FixedGuardNode.class)) {
70 70
71 AbstractBeginNode pred = AbstractBeginNode.prevBegin(fixedGuard); 71 AbstractBeginNode pred = AbstractBeginNode.prevBegin(fixedGuard);
72 if (pred instanceof MergeNode) { 72 if (pred instanceof AbstractMergeNode) {
73 MergeNode merge = (MergeNode) pred; 73 AbstractMergeNode merge = (AbstractMergeNode) pred;
74 if (fixedGuard.condition() instanceof CompareNode) { 74 if (fixedGuard.condition() instanceof CompareNode) {
75 CompareNode compare = (CompareNode) fixedGuard.condition(); 75 CompareNode compare = (CompareNode) fixedGuard.condition();
76 List<AbstractEndNode> mergePredecessors = merge.cfgPredecessors().snapshot(); 76 List<AbstractEndNode> mergePredecessors = merge.cfgPredecessors().snapshot();
77 77
78 Constant[] xs = IfNode.constantValues(compare.getX(), merge, true); 78 Constant[] xs = IfNode.constantValues(compare.getX(), merge, true);
105 105
106 new DeadCodeEliminationPhase(Optional).apply(graph); 106 new DeadCodeEliminationPhase(Optional).apply(graph);
107 } 107 }
108 108
109 private void visitDeoptBegin(AbstractBeginNode deoptBegin, DeoptimizationAction deoptAction, DeoptimizationReason deoptReason, StructuredGraph graph) { 109 private void visitDeoptBegin(AbstractBeginNode deoptBegin, DeoptimizationAction deoptAction, DeoptimizationReason deoptReason, StructuredGraph graph) {
110 if (deoptBegin instanceof MergeNode) { 110 if (deoptBegin instanceof AbstractMergeNode) {
111 MergeNode mergeNode = (MergeNode) deoptBegin; 111 AbstractMergeNode mergeNode = (AbstractMergeNode) deoptBegin;
112 Debug.log("Visiting %s", mergeNode); 112 Debug.log("Visiting %s", mergeNode);
113 FixedNode next = mergeNode.next(); 113 FixedNode next = mergeNode.next();
114 while (mergeNode.isAlive()) { 114 while (mergeNode.isAlive()) {
115 AbstractEndNode end = mergeNode.forwardEnds().first(); 115 AbstractEndNode end = mergeNode.forwardEnds().first();
116 AbstractBeginNode newBeginNode = findBeginNode(end); 116 AbstractBeginNode newBeginNode = findBeginNode(end);