Mercurial > hg > graal-compiler
changeset 14898:3e9a8ef2e0e1
Work around Graph.unique() type issue.
author | Josef Eisl <josef.eisl@jku.at> |
---|---|
date | Tue, 25 Mar 2014 13:31:53 +0100 |
parents | 427576411fd7 |
children | e2a5528599e0 |
files | graal/com.oracle.graal.graph/src/com/oracle/graal/graph/Graph.java graal/com.oracle.graal.java/src/com/oracle/graal/java/GraphBuilderPhase.java |
diffstat | 2 files changed, 4 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/Graph.java Tue Mar 25 12:07:47 2014 +0000 +++ b/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/Graph.java Tue Mar 25 13:31:53 2014 +0100 @@ -26,7 +26,7 @@ import com.oracle.graal.debug.*; import com.oracle.graal.graph.GraphEvent.NodeEvent; -import com.oracle.graal.graph.Node.ValueNumberable; +import com.oracle.graal.graph.Node.*; import com.oracle.graal.graph.iterators.*; /** @@ -344,7 +344,8 @@ * * @return a node similar to {@code node} if one exists, otherwise {@code node} */ - public <T extends Node & ValueNumberable> T unique(T node) { + public <T extends Node> T unique(T node) { + assert node instanceof ValueNumberable; return uniqueHelper(node, true); }
--- a/graal/com.oracle.graal.java/src/com/oracle/graal/java/GraphBuilderPhase.java Tue Mar 25 12:07:47 2014 +0000 +++ b/graal/com.oracle.graal.java/src/com/oracle/graal/java/GraphBuilderPhase.java Tue Mar 25 13:31:53 2014 +0100 @@ -327,7 +327,7 @@ @Override protected ValueNode genUnique(ValueNode x) { - return currentGraph.unique((ValueNumberable) x); + return currentGraph.unique(x); } @Override