Merge pull request #185 in G/truffle from ~CHRISTIAN.HUMER_ORACLE.COM/truffle:sl_new_dsl_layout to master

chumer · chumer · commit 157d6a9d2c25 · 2016-09-06T11:06:50.000-07:00
* commit '2339890855bdafdccc589c7ae2fd9786308c5504':
  Add type system reference SLForeignToSLTypeNode to make it use the new layout.
  Use new DSL layout for SimpleLanguage.
  Deprecate DSLMetadata and remove it from the generator code.
diff --git a/truffle/com.oracle.truffle.api.dsl/src/com/oracle/truffle/api/dsl/internal/DSLMetadata.java b/truffle/com.oracle.truffle.api.dsl/src/com/oracle/truffle/api/dsl/internal/DSLMetadata.java
@@ -26,7 +26,10 @@
 
 /**
  * This is NOT public API. Do not use directly. This code may change without notice.
+ *
+ * @deprecated will be removed soon
  */
+@Deprecated
 public final class DSLMetadata {
 
     public static final Class<?>[] EMPTY_CLASS_ARRAY = new Class<?>[]{};
diff --git a/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/TruffleTypes.java b/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/TruffleTypes.java
@@ -22,6 +22,17 @@
  */
 package com.oracle.truffle.dsl.processor;
 
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.lang.model.element.AnnotationMirror;
+import javax.lang.model.element.Element;
+import javax.lang.model.element.TypeElement;
+import javax.lang.model.type.ArrayType;
+import javax.lang.model.type.DeclaredType;
+import javax.lang.model.type.TypeMirror;
+import javax.tools.Diagnostic.Kind;
+
 import com.oracle.truffle.api.Assumption;
 import com.oracle.truffle.api.CompilerAsserts;
 import com.oracle.truffle.api.CompilerDirectives;
@@ -30,7 +41,6 @@
 import com.oracle.truffle.api.TruffleOptions;
 import com.oracle.truffle.api.dsl.GenerateNodeFactory;
 import com.oracle.truffle.api.dsl.NodeFactory;
-import com.oracle.truffle.api.dsl.internal.DSLMetadata;
 import com.oracle.truffle.api.dsl.internal.NodeFactoryBase;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.InvalidAssumptionException;
@@ -42,15 +52,6 @@
 import com.oracle.truffle.api.nodes.NodeUtil;
 import com.oracle.truffle.api.nodes.UnexpectedResultException;
 import com.oracle.truffle.api.source.SourceSection;
-import java.util.ArrayList;
-import java.util.List;
-import javax.lang.model.element.AnnotationMirror;
-import javax.lang.model.element.Element;
-import javax.lang.model.element.TypeElement;
-import javax.lang.model.type.ArrayType;
-import javax.lang.model.type.DeclaredType;
-import javax.lang.model.type.TypeMirror;
-import javax.tools.Diagnostic.Kind;
 
 /**
  * THIS IS NOT PUBLIC API.
@@ -78,7 +79,6 @@ public final class TruffleTypes {
     private final DeclaredType nodeUtil;
     private final DeclaredType nodeFactory;
     private final DeclaredType nodeFactoryBase;
-    private final DeclaredType dslMetadata;
     private final DeclaredType generateNodeFactory;
     private final TypeElement expectError;
 
@@ -104,7 +104,6 @@ public final class TruffleTypes {
         nodeUtil = getRequired(context, NodeUtil.class);
         nodeFactory = getRequired(context, NodeFactory.class);
         nodeFactoryBase = getRequired(context, NodeFactoryBase.class);
-        dslMetadata = getRequired(context, DSLMetadata.class);
         expectError = getOptional(context, EXPECT_ERROR_CLASS_NAME);
         generateNodeFactory = getRequired(context, GenerateNodeFactory.class);
     }
@@ -113,10 +112,6 @@ public DeclaredType getGenerateNodeFactory() {
         return generateNodeFactory;
     }
 
-    public DeclaredType getDslMetadata() {
-        return dslMetadata;
-    }
-
     public DeclaredType getNodeFactory() {
         return nodeFactory;
     }
diff --git a/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/generator/NodeFactoryFactory.java b/truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/generator/NodeFactoryFactory.java
@@ -46,8 +46,6 @@
 
 class NodeFactoryFactory {
 
-    static final String EMPTY_CLASS_ARRAY = "EMPTY_CLASS_ARRAY";
-
     private final ProcessorContext context;
     private final NodeData node;
     private final CodeTypeElement createdFactoryElement;
@@ -95,33 +93,25 @@ private Element createNodeFactoryConstructor() {
 
         // execution signature
         builder.startGroup();
-        if (node.getChildExecutions().isEmpty()) {
-            builder.staticReference(context.getTruffleTypes().getDslMetadata(), EMPTY_CLASS_ARRAY);
-        } else {
-            builder.startNewArray(new ArrayCodeTypeMirror(context.getType(Class.class)), null);
-            for (NodeExecutionData execution : node.getChildExecutions()) {
-                builder.typeLiteral(execution.getNodeType());
-            }
-            builder.end();
+        builder.startNewArray(new ArrayCodeTypeMirror(context.getType(Class.class)), null);
+        for (NodeExecutionData execution : node.getChildExecutions()) {
+            builder.typeLiteral(execution.getNodeType());
         }
         builder.end();
+        builder.end();
 
         // node signatures
         builder.startGroup();
         builder.startNewArray(new ArrayCodeTypeMirror(new ArrayCodeTypeMirror(context.getType(Class.class))), null);
         List<ExecutableElement> constructors = GeneratorUtils.findUserConstructors(createdFactoryElement.asType());
         for (ExecutableElement constructor : constructors) {
             builder.startGroup();
-            if (constructor.getParameters().isEmpty()) {
-                builder.staticReference(context.getTruffleTypes().getDslMetadata(), EMPTY_CLASS_ARRAY);
-            } else {
-                builder.startNewArray(new ArrayCodeTypeMirror(context.getType(Class.class)), null);
-                for (VariableElement var : constructor.getParameters()) {
-                    builder.typeLiteral(var.asType());
-                }
-                builder.end();
+            builder.startNewArray(new ArrayCodeTypeMirror(context.getType(Class.class)), null);
+            for (VariableElement var : constructor.getParameters()) {
+                builder.typeLiteral(var.asType());
             }
             builder.end();
+            builder.end();
         }
         builder.end();
         builder.end();
diff --git a/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/SLTypes.java b/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/SLTypes.java
@@ -48,6 +48,7 @@
 import com.oracle.truffle.api.dsl.TypeCheck;
 import com.oracle.truffle.api.dsl.TypeSystem;
 import com.oracle.truffle.api.dsl.internal.DSLOptions;
+import com.oracle.truffle.api.dsl.internal.DSLOptions.DSLGenerator;
 import com.oracle.truffle.sl.SLLanguage;
 import com.oracle.truffle.sl.runtime.SLFunction;
 import com.oracle.truffle.sl.runtime.SLNull;
@@ -59,7 +60,7 @@
  * generated ones would not be sufficient.
  */
 @TypeSystem({long.class, BigInteger.class, boolean.class, String.class, SLFunction.class, SLNull.class})
-@DSLOptions
+@DSLOptions(defaultGenerator = DSLGenerator.FLAT)
 public abstract class SLTypes {
 
     /**
diff --git a/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/access/SLPropertyCacheNode.java b/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/access/SLPropertyCacheNode.java
@@ -44,15 +44,18 @@
 
 import com.oracle.truffle.api.CompilerAsserts;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
+import com.oracle.truffle.api.dsl.TypeSystemReference;
 import com.oracle.truffle.api.interop.TruffleObject;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.object.DynamicObject;
 import com.oracle.truffle.api.object.Shape;
+import com.oracle.truffle.sl.nodes.SLTypes;
 import com.oracle.truffle.sl.nodes.expression.SLEqualNode;
 import com.oracle.truffle.sl.runtime.SLContext;
 import com.oracle.truffle.sl.runtime.SLFunction;
 import com.oracle.truffle.sl.runtime.SLNull;
 
+@TypeSystemReference(SLTypes.class)
 public abstract class SLPropertyCacheNode extends Node {
     protected static final int CACHE_LIMIT = 3;
 
diff --git a/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/call/SLDispatchNode.java b/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/call/SLDispatchNode.java
@@ -44,6 +44,7 @@
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Fallback;
 import com.oracle.truffle.api.dsl.Specialization;
+import com.oracle.truffle.api.dsl.TypeSystemReference;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.interop.ArityException;
 import com.oracle.truffle.api.interop.ForeignAccess;
@@ -54,11 +55,13 @@
 import com.oracle.truffle.api.nodes.DirectCallNode;
 import com.oracle.truffle.api.nodes.IndirectCallNode;
 import com.oracle.truffle.api.nodes.Node;
+import com.oracle.truffle.sl.nodes.SLTypes;
 import com.oracle.truffle.sl.nodes.interop.SLForeignToSLTypeNode;
 import com.oracle.truffle.sl.nodes.interop.SLForeignToSLTypeNodeGen;
 import com.oracle.truffle.sl.runtime.SLFunction;
 import com.oracle.truffle.sl.runtime.SLUndefinedNameException;
 
+@TypeSystemReference(SLTypes.class)
 public abstract class SLDispatchNode extends Node {
 
     protected static final int INLINE_CACHE_SIZE = 2;
diff --git a/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/interop/SLForeignToSLTypeNode.java b/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/interop/SLForeignToSLTypeNode.java
@@ -42,18 +42,21 @@
 
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.dsl.Specialization;
+import com.oracle.truffle.api.dsl.TypeSystemReference;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.interop.ForeignAccess;
 import com.oracle.truffle.api.interop.Message;
 import com.oracle.truffle.api.interop.TruffleObject;
 import com.oracle.truffle.api.interop.UnsupportedMessageException;
 import com.oracle.truffle.api.nodes.Node;
+import com.oracle.truffle.sl.nodes.SLTypes;
 import com.oracle.truffle.sl.runtime.SLContext;
 import com.oracle.truffle.sl.runtime.SLNull;
 
 /**
  * The node for converting a foreign primitive or boxed primitive value to an SL value.
  */
+@TypeSystemReference(SLTypes.class)
 public abstract class SLForeignToSLTypeNode extends Node {
 
     public abstract Object executeConvert(VirtualFrame frame, Object value);
