Recent Truffle DSL changes.

[Stefan Marr]

Hi Christian:

On 11 Aug 2014, at 19:59, Christian Humer <christian.humer at gmail.com> wrote:

> I just pushed some new features to the DSL for the upcoming Truffle
> release. Please note that some of the changes may break existing Truffle
> interpreters. Guest languages that don't use Truffle DSL are not affected
> by this push.

I finally found the time to update Graal.
Looks good. Didn’t had any major issues. Performance seems to remain more or less the same.

Only got two nits. The first one is that the generated code does have one simple issue with the code style, which can be solved by initializing the method body unconditionally (see patch below).
The second thing is a simple typo in one of the error messages.

Best regards
Stefan

diff --git a/graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/generator/NodeCodeGenerator.java b/graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/generator/NodeCodeGenerator.java
index 0a38640..c3bc5eb 100644
--- a/graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/generator/NodeCodeGenerator.java
+++ b/graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/generator/NodeCodeGenerator.java
@@ -906,9 +906,9 @@ public class NodeCodeGenerator extends AbstractCompilationUnitFactory<NodeData>
             CodeExecutableElement method = new CodeExecutableElement(modifiers(PUBLIC), context.getType(void.class), "updateTypes0");
             method.getParameters().add(new CodeVariableElement(classArray, "types"));
 
-            if (getModel().isPolymorphic()) {
-                CodeTreeBuilder builder = method.createBuilder();
+            CodeTreeBuilder builder = method.createBuilder();
 
+            if (getModel().isPolymorphic()) {
                 int index = 0;
                 for (NodeExecutionData execution : getModel().getNode().getChildExecutions()) {
                     String fieldName = polymorphicTypeName(execution);
diff --git a/graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/parser/NodeParser.java b/graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/parser/NodeParser.java
index 202815e..516dc18 100644
--- a/graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/parser/NodeParser.java
+++ b/graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/parser/NodeParser.java
@@ -650,7 +650,7 @@ public class NodeParser extends AbstractParser<NodeData> {
             SpecializationData next = i + 1 < specializations.size() ? specializations.get(i + 1) : null;
 
             if (!cur.isContainedBy(next)) {
-                next.addError("This specialiation is not a valid exceptional rewrite target for %s. To fix this make %s compatible to %s or remove the exceptional rewrite.",
+                next.addError("This specialization is not a valid exceptional rewrite target for %s. To fix this make %s compatible to %s or remove the exceptional rewrite.",
                                 cur.createReferenceName(), next != null ? next.createReferenceName() : "-", cur.createReferenceName());
                 continue;
             }
-- 
1.9.1




-- 
Stefan Marr
INRIA Lille - Nord Europe
http://stefan-marr.de/research/