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

* commit 'cdecd17ca1533cd9ea55f89befd348624e6c184e':
  Add test for implicit casts for type in evaluated execute methods.
  Fix use new fallthrough flag also for slow path generation.
  Fix execute methods with typed evaluated parameters that are implicitely casted with a subtype as source type should do the implicit type guard to inject specialized information.

Author: chumer

truffle/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/ImplicitCastTest.java

@@ -31,12 +31,16 @@
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.dsl.TypeSystem;
 import com.oracle.truffle.api.dsl.TypeSystemReference;
+import com.oracle.truffle.api.dsl.internal.DSLOptions;
+import com.oracle.truffle.api.dsl.internal.DSLOptions.DSLGenerator;
 import com.oracle.truffle.api.dsl.test.ImplicitCastTestFactory.ImplicitCast0NodeFactory;
 import com.oracle.truffle.api.dsl.test.ImplicitCastTestFactory.ImplicitCast1NodeFactory;
 import com.oracle.truffle.api.dsl.test.ImplicitCastTestFactory.ImplicitCast2NodeFactory;
+import com.oracle.truffle.api.dsl.test.ImplicitCastTestFactory.ImplicitCast3NodeGen;
 import com.oracle.truffle.api.dsl.test.TypeSystemTest.TestRootNode;
 import com.oracle.truffle.api.dsl.test.TypeSystemTest.ValueNode;
 import com.oracle.truffle.api.frame.VirtualFrame;
+import com.oracle.truffle.api.nodes.Node;
 
 public class ImplicitCastTest {
 
@@ -55,6 +59,20 @@ static boolean castString(String strvalue) {
 
     }
 
+    private static int charSequenceCast;
+
+    @TypeSystem
+    @DSLOptions(defaultGenerator = DSLGenerator.FLAT)
+    static class ImplicitCast1Types {
+
+        @ImplicitCast
+        static CharSequence castCharSequence(String strvalue) {
+            charSequenceCast++;
+            return strvalue;
+        }
+
+    }
+
     @TypeSystemReference(ImplicitCast0Types.class)
     @NodeChild(value = "operand", type = ImplicitCast0Node.class)
     abstract static class ImplicitCast0Node extends ValueNode {
@@ -161,6 +179,28 @@ public void testImplicitCast2() {
         Assert.assertEquals(true, root.getNode().executeEvaluated(null, true, true));
     }
 
+    @TypeSystemReference(ImplicitCast1Types.class)
+    abstract static class ImplicitCast3Node extends Node {
+
+        @Specialization
+        public CharSequence op0(CharSequence v0, @SuppressWarnings("unused") CharSequence v1) {
+            return v0;
+        }
+
+        public abstract Object executeEvaluated(CharSequence v1, CharSequence v2);
+
+    }
+
+    @Test
+    public void testImplicitCast3() {
+        ImplicitCast3Node node = ImplicitCast3NodeGen.create();
+        CharSequence seq1 = "foo";
+        CharSequence seq2 = "bar";
+        charSequenceCast = 0;
+        node.executeEvaluated(seq1, seq2);
+        Assert.assertEquals(2, charSequenceCast);
+    }
+
     @TypeSystem({String.class, boolean.class})
     static class ImplicitCastError1 {
 

truffle/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/generator/FlatNodeGenFactory.java

@@ -783,7 +783,7 @@ private CodeExecutableElement createExecuteAndSpecialize() {
 
         builder.tree(execution);
 
-        if (hasFallthrough(group, genericType, originalFrameState)) {
+        if (group.hasFallthrough()) {
             builder.tree(createTransferToInterpreterAndInvalidate());
             builder.tree(createThrowUnsupported(builder, originalFrameState));
         }
@@ -1454,41 +1454,6 @@ private SpecializationGroup createSpecializationGroups() {
         return SpecializationGroup.createFlat(reachableSpecializations);
     }
 
-    private boolean hasFallthrough(SpecializationGroup group, TypeMirror forType, FrameState frameState) {
-        for (TypeGuard guard : group.getTypeGuards()) {
-            if (frameState.getValue(guard.getSignatureIndex()) == null) {
-                // not evaluated
-                return true;
-            }
-            LocalVariable value = frameState.getValue(guard.getSignatureIndex());
-            if (needsCastTo(value.getTypeMirror(), guard.getType())) {
-                return true;
-            }
-        }
-
-        List<GuardExpression> guards = new ArrayList<>(group.getGuards());
-        SpecializationData specialization = group.getSpecialization();
-
-        if (!guards.isEmpty()) {
-            return true;
-        }
-
-        if (specialization != null && !specialization.getAssumptionExpressions().isEmpty()) {
-            return true;
-        }
-
-        if (specialization != null && mayBeExcluded(specialization)) {
-            return true;
-        }
-
-        List<SpecializationGroup> groupChildren = group.getChildren();
-        if (!groupChildren.isEmpty()) {
-            return hasFallthrough(groupChildren.get(groupChildren.size() - 1), forType, frameState);
-        }
-
-        return false;
-    }
-
     private CodeTree expectOrCast(TypeMirror sourceType, ExecutableTypeData targetType, CodeTree content) {
         if (needsUnexpectedResultException(targetType)) {
             return expect(sourceType, targetType.getReturnType(), content);
@@ -1828,7 +1793,7 @@ private CodeTree visitSpecializationGroup(CodeTreeBuilder parent, Specialization
             }
 
             builder.end(ifCount);
-            hasFallthrough = ifCount > 0;
+            hasFallthrough |= ifCount > 0;
 
         } else if (execution.isSlowPath()) {
 
@@ -1880,8 +1845,6 @@ private CodeTree visitSpecializationGroup(CodeTreeBuilder parent, Specialization
                     builder.end();
                 }
 
-                builder.end(ifCount);
-
             } else {
 
                 List<AssumptionExpression> assumptions = specialization.getAssumptionExpressions();
@@ -2009,6 +1972,7 @@ private CodeTree visitSpecializationGroup(CodeTreeBuilder parent, Specialization
                 if (!guards.isEmpty()) {
                     builder.startIf().tree(guards).end();
                     builder.startBlock();
+                    hasFallthrough = true;
                 }
 
                 if (!guardAssertions.isEmpty()) {
@@ -2129,6 +2093,7 @@ private CodeTree visitSpecializationGroup(CodeTreeBuilder parent, Specialization
                 builder.tree(state.createSet(frameState, new SpecializationData[]{specialization}, true, true));
 
                 if (needsDuplicationCheck) {
+                    hasFallthrough = true;
                     if (!useSpecializationClass) {
                         builder.startStatement().string(duplicateFoundName, " = true").end();
                     }
@@ -2155,7 +2120,7 @@ private CodeTree visitSpecializationGroup(CodeTreeBuilder parent, Specialization
             }
 
             builder.end(ifCount);
-            hasFallthrough = ifCount > 0;
+            hasFallthrough |= ifCount > 0;
 
         } else if (execution.isGuardFallback()) {
 
@@ -2232,7 +2197,7 @@ private CodeTree visitSpecializationGroup(CodeTreeBuilder parent, Specialization
 
             builder.end(ifCount);
 
-            hasFallthrough = ifCount > 0;
+            hasFallthrough |= ifCount > 0;
 
         } else {
             throw new AssertionError("unexpected path");
@@ -2646,9 +2611,21 @@ private CodeTree[] createTypeCheckAndLocals(SpecializationGroup group, List<Type
             int signatureIndex = typeGuard.getSignatureIndex();
             LocalVariable value = frameState.getValue(signatureIndex);
             TypeMirror targetType = typeGuard.getType();
+
             if (!ElementUtils.needsCastTo(value.getTypeMirror(), targetType)) {
-                continue;
+                List<ImplicitCastData> casts = typeSystem.lookupByTargetType(targetType);
+                boolean foundImplicitSubType = false;
+                for (ImplicitCastData cast : casts) {
+                    if (ElementUtils.isSubtype(cast.getSourceType(), targetType)) {
+                        foundImplicitSubType = true;
+                        break;
+                    }
+                }
+                if (!foundImplicitSubType) {
+                    continue;
+                }
             }
+
             NodeExecutionData execution = node.getChildExecutions().get(signatureIndex);
             if (!checksBuilder.isEmpty()) {
                 checksBuilder.string(" && ");