Mercurial > hg > truffle
changeset 15382:279898d12346
Harmonize usage of NodeInterface
| author | Gilles Duboscq <duboscq@ssw.jku.at> |
|---|---|
| date | Thu, 24 Apr 2014 17:35:21 +0200 |
| parents | ed7234f0168f |
| children | b14d85af515f |
| files | graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/GuardedNode.java graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/MemoryCheckpoint.java graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/Lowerable.java graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/NodeWithState.java |
| diffstat | 4 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/GuardedNode.java Thu Apr 24 17:31:54 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/GuardedNode.java Thu Apr 24 17:35:21 2014 +0200 @@ -22,12 +22,13 @@ */ package com.oracle.graal.nodes.extended; +import com.oracle.graal.graph.*; import com.oracle.graal.nodes.*; /** * A node that may be guarded by a {@linkplain GuardingNode guarding node}. */ -public interface GuardedNode { +public interface GuardedNode extends NodeInterface { GuardingNode getGuard();
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/MemoryCheckpoint.java Thu Apr 24 17:31:54 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/MemoryCheckpoint.java Thu Apr 24 17:35:21 2014 +0200 @@ -31,7 +31,7 @@ * represented by location identities (i.e. change a value at one or more locations that belong to * these location identities). */ -public interface MemoryCheckpoint extends MemoryNode { +public interface MemoryCheckpoint extends MemoryNode, NodeInterface { FixedNode asNode(); @@ -40,7 +40,7 @@ /** * This method is used to determine which memory location is killed by this node. Returning * the special value {@link LocationIdentity#ANY_LOCATION} will kill all memory locations. - * + * * @return the identity of the location killed by this node. */ LocationIdentity getLocationIdentity(); @@ -53,7 +53,7 @@ * This method is used to determine which set of memory locations is killed by this node. * Returning the special value {@link LocationIdentity#ANY_LOCATION} will kill all memory * locations. - * + * * @return the identities of all locations killed by this node. */ LocationIdentity[] getLocationIdentities();
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/Lowerable.java Thu Apr 24 17:31:54 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/Lowerable.java Thu Apr 24 17:35:21 2014 +0200 @@ -22,13 +22,14 @@ */ package com.oracle.graal.nodes.spi; +import com.oracle.graal.graph.*; import com.oracle.graal.nodes.*; /** * Interface implemented by nodes that can replace themselves with lower level nodes during a phase * that transforms a graph to replace higher level nodes with lower level nodes. */ -public interface Lowerable { +public interface Lowerable extends NodeInterface { /** * Expand this node into lower level nodes expressing the same semantics. If the introduced
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/NodeWithState.java Thu Apr 24 17:31:54 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/NodeWithState.java Thu Apr 24 17:35:21 2014 +0200 @@ -29,9 +29,7 @@ /** * Interface for nodes which have {@link FrameState} nodes as input. */ -public interface NodeWithState { - - Node asNode(); +public interface NodeWithState extends NodeInterface { default NodeIterable<FrameState> states() { return asNode().inputs().filter(FrameState.class);