# HG changeset patch # User Miguel Garcia # Date 1398775223 -7200 # Node ID bdb517afe52423e003bdd5caeb7a9302457f5161 # Parent 3af4870a67e49a00b3097ede55eef745c62136b7 [flow-sensitive] renaming: downcast-helpers diff -r 3af4870a67e4 -r bdb517afe524 graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/cfs/CheckCastReduction.java --- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/cfs/CheckCastReduction.java Tue Apr 29 13:32:28 2014 +0200 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/cfs/CheckCastReduction.java Tue Apr 29 14:40:23 2014 +0200 @@ -60,7 +60,7 @@ * This method turns non-redundant {@link com.oracle.graal.nodes.java.CheckCastNode}s into * {@link com.oracle.graal.nodes.GuardingPiNode}s. Once such lowering has been performed (during * run N of this phase) follow-up runs attempt to further simplify the resulting node, see - * {@link EquationalReasoner#downcastedGuardingPiNode(com.oracle.graal.nodes.GuardingPiNode, Witness)} + * {@link EquationalReasoner#downcastGuardingPiNode(com.oracle.graal.nodes.GuardingPiNode, Witness)} * and {@link #visitGuardingPiNode(com.oracle.graal.nodes.GuardingPiNode)} *

* diff -r 3af4870a67e4 -r bdb517afe524 graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/cfs/EquationalReasoner.java --- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/cfs/EquationalReasoner.java Tue Apr 29 13:32:28 2014 +0200 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/cfs/EquationalReasoner.java Tue Apr 29 14:40:23 2014 +0200 @@ -581,7 +581,7 @@ ValueNode result; if (object instanceof ValueProxy) { - result = downcastedValueProxy((ValueProxy) object, w); + result = downcastValueProxy((ValueProxy) object, w); } else { result = downcastedUtil(object, w); } @@ -733,7 +733,7 @@ *

*/ // @formatter:on - private ValueNode downcastedValueProxy(ValueProxy proxy, Witness w) { + private ValueNode downcastValueProxy(ValueProxy proxy, Witness w) { assert FlowUtil.hasLegalObjectStamp((ValueNode) proxy); assert FlowUtil.hasLegalObjectStamp((proxy).getOriginalNode()); assert GraphUtil.unproxify((ValueNode) proxy) == GraphUtil.unproxify(proxy.getOriginalNode()); @@ -741,13 +741,13 @@ assert GraphUtil.unproxify((ValueNode) proxy) == GraphUtil.unproxify((proxy).getOriginalNode()); if (proxy instanceof PiNode) { - return downcastedPiNodeOrPiArrayNode((PiNode) proxy, w); + return downcastPiNodeOrPiArrayNode((PiNode) proxy, w); } else if (proxy instanceof GuardingPiNode) { - return downcastedGuardingPiNode((GuardingPiNode) proxy, w); + return downcastGuardingPiNode((GuardingPiNode) proxy, w); } else if (proxy instanceof TypeProfileProxyNode) { - return downcastedTypeProfileProxyNode((TypeProfileProxyNode) proxy); + return downcastTypeProfileProxyNode((TypeProfileProxyNode) proxy); } else if (proxy instanceof CheckCastNode) { - return downcastedCheckCastNode((CheckCastNode) proxy, w); + return downcastCheckCastNode((CheckCastNode) proxy, w); } else if (proxy instanceof ProxyNode || proxy instanceof GuardedValueNode) { // TODO scaladacapo return downcastedUtil((ValueNode) proxy, w); return (ValueNode) proxy; @@ -781,9 +781,9 @@ * GuardingPiNode is clear: devirtualizing the `intValue()` callsite. *

* - * @see #downcastedValueProxy + * @see #downcastValueProxy */ - public ValueNode downcastedGuardingPiNode(GuardingPiNode envelope, Witness w) { + public ValueNode downcastGuardingPiNode(GuardingPiNode envelope, Witness w) { assert envelope != w.guard().asNode() : "The stamp of " + envelope + " would lead to downcasting with that very same GuardingPiNode as guard."; return downcastedUtil(envelope, w); } @@ -813,9 +813,9 @@ * PiNode.canonical()} does). Not clear the benefits of duplicating that logic here. *

* - * @see #downcastedValueProxy + * @see #downcastValueProxy */ - private ValueNode downcastedPiNodeOrPiArrayNode(PiNode envelope, Witness w) { + private ValueNode downcastPiNodeOrPiArrayNode(PiNode envelope, Witness w) { return downcastedUtil(envelope, w); } @@ -829,9 +829,9 @@ * Otherwise returns the unmodified argument. *

* - * @see #downcastedValueProxy + * @see #downcastValueProxy */ - private ValueNode downcastedTypeProfileProxyNode(TypeProfileProxyNode envelope) { + private ValueNode downcastTypeProfileProxyNode(TypeProfileProxyNode envelope) { ValueNode payload = envelope.getOriginalNode(); ValueNode d = downcast(payload); if (payload != d) { @@ -860,7 +860,7 @@ * the downcasted scrutinee does not conform to the checkCast's target-type. *

*/ - private ValueNode downcastedCheckCastNode(CheckCastNode checkCast, Witness w) { + private ValueNode downcastCheckCastNode(CheckCastNode checkCast, Witness w) { final ResolvedJavaType toType = checkCast.type();