# HG changeset patch # User Christian Humer # Date 1363445628 -3600 # Node ID 3fbe6772dbf615dbf06963c80186bccff3012571 # Parent 2be3865d9ea039a4c28a1c5d5533182605fef404 Cleanup. diff -r 2be3865d9ea0 -r 3fbe6772dbf6 graal/com.oracle.truffle.codegen.processor/src/com/oracle/truffle/codegen/processor/node/NodeData.java --- a/graal/com.oracle.truffle.codegen.processor/src/com/oracle/truffle/codegen/processor/node/NodeData.java Sat Mar 16 15:53:04 2013 +0100 +++ b/graal/com.oracle.truffle.codegen.processor/src/com/oracle/truffle/codegen/processor/node/NodeData.java Sat Mar 16 15:53:48 2013 +0100 @@ -76,32 +76,36 @@ @Override protected List findChildContainers() { - List sinks = new ArrayList<>(); + List children = new ArrayList<>(); if (declaredChildren != null) { - sinks.addAll(declaredChildren); + children.addAll(declaredChildren); } if (typeSystem != null) { - sinks.add(typeSystem); + children.add(typeSystem); } if (specializations != null) { - sinks.addAll(specializations); + for (MessageContainer specialization : specializations) { + if (specialization.getMessageElement() != null) { + children.add(specialization); + } + } } if (specializationListeners != null) { - sinks.addAll(specializationListeners); + children.addAll(specializationListeners); } if (guards != null) { - sinks.addAll(guards); + children.addAll(guards); } if (executableTypes != null) { - sinks.addAll(executableTypes); + children.addAll(executableTypes); } if (shortCircuits != null) { - sinks.addAll(shortCircuits); + children.addAll(shortCircuits); } if (fields != null) { - sinks.addAll(fields); + children.addAll(fields); } - return sinks; + return children; } public ParameterSpec getInstanceParameterSpec() { diff -r 2be3865d9ea0 -r 3fbe6772dbf6 graal/com.oracle.truffle.codegen.processor/src/com/oracle/truffle/codegen/processor/node/NodeFieldData.java --- a/graal/com.oracle.truffle.codegen.processor/src/com/oracle/truffle/codegen/processor/node/NodeFieldData.java Sat Mar 16 15:53:04 2013 +0100 +++ b/graal/com.oracle.truffle.codegen.processor/src/com/oracle/truffle/codegen/processor/node/NodeFieldData.java Sat Mar 16 15:53:48 2013 +0100 @@ -110,7 +110,7 @@ @Override public String toString() { - return "NodeFieldData[name=" + getName() + ", kind=" + fieldKind + ", execution=" + executionKind + ", node=" + getNodeData().toString() + "]"; + return "NodeFieldData[name=" + getName() + ", kind=" + fieldKind + ", execution=" + executionKind + ", node=" + getNodeData() + "]"; } }