# HG changeset patch # User Doug Simon # Date 1409646605 -7200 # Node ID 0a036547149c03358f266212c50639291d3b9e91 # Parent 2c04d7665bf6b2b63ede012e529f0b038591d1a5 use source field declaration order in generated Node classes diff -r 2c04d7665bf6 -r 0a036547149c graal/com.oracle.graal.nodeinfo.processor/src/com/oracle/graal/nodeinfo/processor/GraphNodeGenerator.java --- a/graal/com.oracle.graal.nodeinfo.processor/src/com/oracle/graal/nodeinfo/processor/GraphNodeGenerator.java Tue Sep 02 09:56:48 2014 +0200 +++ b/graal/com.oracle.graal.nodeinfo.processor/src/com/oracle/graal/nodeinfo/processor/GraphNodeGenerator.java Tue Sep 02 10:30:05 2014 +0200 @@ -38,6 +38,8 @@ import com.oracle.graal.nodeinfo.*; import com.oracle.truffle.dsl.processor.java.*; +import com.oracle.truffle.dsl.processor.java.compiler.*; +import com.oracle.truffle.dsl.processor.java.compiler.Compiler; import com.oracle.truffle.dsl.processor.java.model.*; /** @@ -162,9 +164,10 @@ } private void scanFields(TypeElement node) { + Compiler compiler = CompilerFactory.getCompiler(node); TypeElement currentClazz = node; do { - for (VariableElement field : ElementFilter.fieldsIn(currentClazz.getEnclosedElements())) { + for (VariableElement field : ElementFilter.fieldsIn(compiler.getEnclosedElementsInDeclarationOrder(currentClazz))) { Set modifiers = field.getModifiers(); if (modifiers.contains(STATIC) || modifiers.contains(TRANSIENT)) { continue;