Mercurial > hg > truffle

changeset 8315:3fbe6772dbf6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Cleanup.
author Christian Humer <christian.humer@gmail.com>
date Sat, 16 Mar 2013 15:53:48 +0100
parents 2be3865d9ea0
children c210577168e7
files graal/com.oracle.truffle.codegen.processor/src/com/oracle/truffle/codegen/processor/node/NodeData.java graal/com.oracle.truffle.codegen.processor/src/com/oracle/truffle/codegen/processor/node/NodeFieldData.java
diffstat 2 files changed, 15 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- 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<MessageContainer> findChildContainers() {
-        List<MessageContainer> sinks = new ArrayList<>();
+        List<MessageContainer> 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() {
--- 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() + "]";
     }
 
 }