Mercurial > hg > graal-compiler
changeset 15429:edf0c031da76
[flow-sensitive] renaming: untrivialNull -> nonTrivialNull
author | Miguel Garcia <miguel.m.garcia@oracle.com> |
---|---|
date | Tue, 29 Apr 2014 14:42:51 +0200 |
parents | bdb517afe524 |
children | 30290fbe25b9 |
files | graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/cfs/CheckCastReduction.java graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/cfs/EquationalReasoner.java graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/cfs/FixedGuardReduction.java graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/cfs/GuardingPiReduction.java |
diffstat | 4 files changed, 10 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/cfs/CheckCastReduction.java Tue Apr 29 14:40:23 2014 +0200 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/cfs/CheckCastReduction.java Tue Apr 29 14:42:51 2014 +0200 @@ -109,7 +109,7 @@ * others. */ - PiNode untrivialNull = reasoner.untrivialNull(subject); + PiNode untrivialNull = reasoner.nonTrivialNull(subject); if (untrivialNull != null) { metricCheckCastRemoved.increment(); checkCast.replaceAtUsages(untrivialNull);
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/cfs/EquationalReasoner.java Tue Apr 29 14:40:23 2014 +0200 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/cfs/EquationalReasoner.java Tue Apr 29 14:42:51 2014 +0200 @@ -483,7 +483,7 @@ return isNull; } ValueNode scrutinee = GraphUtil.unproxify(isNull.object()); - GuardingNode evidence = untrivialNullAnchor(scrutinee); + GuardingNode evidence = nonTrivialNullAnchor(scrutinee); if (evidence != null) { metricNullCheckRemoved.increment(); return trueConstant; @@ -547,7 +547,7 @@ return object; } if (StampTool.isObjectAlwaysNull(object.stamp())) { - return untrivialNull(object); + return nonTrivialNull(object); } // ------------------------------------------ @@ -556,7 +556,7 @@ ValueNode scrutinee = GraphUtil.unproxify(object); - PiNode untrivialNull = untrivialNull(scrutinee); + PiNode untrivialNull = nonTrivialNull(scrutinee); if (untrivialNull != null) { return untrivialNull; } @@ -653,7 +653,7 @@ * Otherwise, if an anchor is found it is returned, null otherwise. * </p> */ - public GuardingNode untrivialNullAnchor(ValueNode object) { + public GuardingNode nonTrivialNullAnchor(ValueNode object) { assert FlowUtil.hasLegalObjectStamp(object); if (StampTool.isObjectAlwaysNull(object)) { return null; @@ -676,9 +676,9 @@ * . * </p> */ - public PiNode untrivialNull(ValueNode object) { + public PiNode nonTrivialNull(ValueNode object) { assert FlowUtil.hasLegalObjectStamp(object); - GuardingNode anchor = untrivialNullAnchor(object); + GuardingNode anchor = nonTrivialNullAnchor(object); if (anchor == null) { return null; }
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/cfs/FixedGuardReduction.java Tue Apr 29 14:40:23 2014 +0200 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/cfs/FixedGuardReduction.java Tue Apr 29 14:42:51 2014 +0200 @@ -104,7 +104,7 @@ final IsNullNode isNullNode = (IsNullNode) cond; if (isTrue) { // grab an anchor attesting nullness - final GuardingNode replacement = reasoner.untrivialNullAnchor(isNullNode.object()); + final GuardingNode replacement = reasoner.nonTrivialNullAnchor(isNullNode.object()); if (replacement != null) { removeFixedGuardNode(f, replacement); return; @@ -152,7 +152,7 @@ } else { // grab an anchor attesting not-instanceof // (1 of 2) attempt determining nullness - final GuardingNode nullGuard = reasoner.untrivialNullAnchor(iOf.object()); + final GuardingNode nullGuard = reasoner.nonTrivialNullAnchor(iOf.object()); if (nullGuard != null) { removeFixedGuardNode(f, nullGuard); return;
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/cfs/GuardingPiReduction.java Tue Apr 29 14:40:23 2014 +0200 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/cfs/GuardingPiReduction.java Tue Apr 29 14:42:51 2014 +0200 @@ -203,7 +203,7 @@ /* * GuardingPiNode succeeds if payload null */ - ValueNode replacement = StampTool.isObjectAlwaysNull(payload) ? payload : reasoner.untrivialNull(payload); + ValueNode replacement = StampTool.isObjectAlwaysNull(payload) ? payload : reasoner.nonTrivialNull(payload); if (replacement != null) { // replacement == null means !isKnownNull(payload) removeGuardingPiNode(envelope, replacement);