# HG changeset patch
# User Christian Humer <christian.humer@gmail.com>
# Date 1378483167 -7200
# Node ID 2391d44f9d2c430097641fc6ebe1323520cfa6c1
# Parent  6014bd8d52ce82a797c230a43aceccebe8b4098c
Truffle-DSL: fixed a if bug target parameters and executes accidently do not match.

diff -r 6014bd8d52ce -r 2391d44f9d2c graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/node/NodeCodeGenerator.java
--- a/graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/node/NodeCodeGenerator.java	Fri Sep 06 16:54:32 2013 +0200
+++ b/graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/node/NodeCodeGenerator.java	Fri Sep 06 17:59:27 2013 +0200
@@ -2003,6 +2003,10 @@
                 startCallTypeSystemMethod(getContext(), builder, child.getNodeData(), cast.getMethodName());
             }
 
+            if (targetExecutable.getType().needsCastTo(context, targetParameter.getTypeSystemType()) && cast == null) {
+                startCallTypeSystemMethod(getContext(), builder, child.getNodeData(), TypeSystemCodeGenerator.expectTypeMethodName(targetParameter.getTypeSystemType()));
+            }
+
             NodeData node = getModel().getNode();
             ActualParameter sourceParameter = sourceExecutable.findParameter(targetParameter.getLocalName());
             if (sourceParameter == null) {
@@ -2011,6 +2015,11 @@
                 CodeTree var = CodeTreeBuilder.singleString(valueNameEvaluated(targetParameter));
                 builder.tree(createExpectExecutableType(node, sourceParameter.getTypeSystemType(), targetExecutable, var));
             }
+
+            if (targetExecutable.getType().needsCastTo(context, targetParameter.getTypeSystemType())) {
+                builder.end().end();
+            }
+
             if (cast != null) {
                 builder.end().end();
             }
@@ -2049,6 +2058,10 @@
         }
 
         private boolean hasUnexpectedType(ExecutableTypeData target, ActualParameter sourceParameter, TypeData type) {
+            boolean targetCast = target.getType().needsCastTo(context, type);
+            if (targetCast && getModel().getNode().getTypeSystem().lookupCast(target.getType(), type) == null) {
+                return true;
+            }
             if (sourceParameter == null) {
                 return target.hasUnexpectedValue(getContext());
             } else {