Mercurial > hg > truffle

comparison graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/UseTrappingNullChecksPhase.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 2ccaaf5a6be4
comparison
equal deleted inserted replaced
18994:8b4ef818169c 18995:a2cb19764970
56 } 56 }
57 } 57 }
58 58
59 private static void tryUseTrappingNullCheck(MetaAccessProvider metaAccessProvider, DynamicDeoptimizeNode deopt) { 59 private static void tryUseTrappingNullCheck(MetaAccessProvider metaAccessProvider, DynamicDeoptimizeNode deopt) {
60 Node predecessor = deopt.predecessor(); 60 Node predecessor = deopt.predecessor();
61 if (predecessor instanceof MergeNode) { 61 if (predecessor instanceof AbstractMergeNode) {
62 MergeNode merge = (MergeNode) predecessor; 62 AbstractMergeNode merge = (AbstractMergeNode) predecessor;
63 63
64 // Process each predecessor at the merge, unpacking the reasons and speculations as 64 // Process each predecessor at the merge, unpacking the reasons and speculations as
65 // needed. 65 // needed.
66 ValueNode reason = deopt.getActionAndReason(); 66 ValueNode reason = deopt.getActionAndReason();
67 ValuePhiNode reasonPhi = null; 67 ValuePhiNode reasonPhi = null;
113 return; 113 return;
114 } 114 }
115 if (speculation != null && !speculation.equals(JavaConstant.NULL_POINTER)) { 115 if (speculation != null && !speculation.equals(JavaConstant.NULL_POINTER)) {
116 return; 116 return;
117 } 117 }
118 if (predecessor instanceof MergeNode) { 118 if (predecessor instanceof AbstractMergeNode) {
119 MergeNode merge = (MergeNode) predecessor; 119 AbstractMergeNode merge = (AbstractMergeNode) predecessor;
120 if (merge.phis().isEmpty()) { 120 if (merge.phis().isEmpty()) {
121 for (AbstractEndNode end : merge.cfgPredecessors().snapshot()) { 121 for (AbstractEndNode end : merge.cfgPredecessors().snapshot()) {
122 checkPredecessor(deopt, end.predecessor(), deoptimizationReason); 122 checkPredecessor(deopt, end.predecessor(), deoptimizationReason);
123 } 123 }
124 } 124 }