Mercurial > hg > graal-compiler
changeset 11482:cb364a90ef62
Truffle-DSL: fixed wrong equals/hashCode in Template.
author | Christian Humer <christian.humer@gmail.com> |
---|---|
date | Fri, 30 Aug 2013 17:00:26 +0200 |
parents | a317acdd5f2c |
children | ff41fd80d562 |
files | graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/node/NodeParser.java graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/template/Template.java |
diffstat | 2 files changed, 1 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/node/NodeParser.java Fri Aug 30 15:55:52 2013 +0200 +++ b/graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/node/NodeParser.java Fri Aug 30 17:00:26 2013 +0200 @@ -462,7 +462,7 @@ nodeChild.setNode(fieldNodeData); if (fieldNodeData == null) { nodeChild.addError("Node type '%s' is invalid or not a valid Node.", Utils.getQualifiedName(childType)); - } else if (!fieldNodeData.getTypeSystem().equals(node.getTypeSystem())) { + } else if (!Utils.typeEquals(fieldNodeData.getTypeSystem().getTemplateType().asType(), (node.getTypeSystem().getTemplateType().asType()))) { nodeChild.addError("The @%s of the node and the @%s of the @%s does not match. %s != %s. ", TypeSystem.class.getSimpleName(), TypeSystem.class.getSimpleName(), NodeChild.class.getSimpleName(), Utils.getSimpleName(node.getTypeSystem().getTemplateType()), Utils.getSimpleName(fieldNodeData.getTypeSystem().getTemplateType())); }
--- a/graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/template/Template.java Fri Aug 30 15:55:52 2013 +0200 +++ b/graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/template/Template.java Fri Aug 30 17:00:26 2013 +0200 @@ -49,19 +49,6 @@ } @Override - public boolean equals(Object obj) { - if (obj instanceof Template) { - return Utils.typeEquals(getTemplateType().asType(), ((Template) obj).getTemplateType().asType()); - } - return false; - } - - @Override - public int hashCode() { - return templateType.hashCode(); - } - - @Override protected List<MessageContainer> findChildContainers() { return Collections.emptyList(); }