# HG changeset patch
# User Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
# Date 1366913449 -7200
# Node ID 9fde96e0c96b2e6a6eb60a5d688837e71b50ba43
# Parent  46f2b152d249f4d97ce068380f8f179bdf4c72d5# Parent  2e12f1719a42365f9b86f24b1f71e39086bd0f04
Merge.

diff -r 46f2b152d249 -r 9fde96e0c96b graal/com.oracle.truffle.codegen.processor/src/com/oracle/truffle/codegen/processor/node/NodeCodeGenerator.java
--- a/graal/com.oracle.truffle.codegen.processor/src/com/oracle/truffle/codegen/processor/node/NodeCodeGenerator.java	Thu Apr 25 20:00:23 2013 +0200
+++ b/graal/com.oracle.truffle.codegen.processor/src/com/oracle/truffle/codegen/processor/node/NodeCodeGenerator.java	Thu Apr 25 20:10:49 2013 +0200
@@ -96,8 +96,7 @@
         }
     }
 
-    private static void addInternalValueParameterNames(CodeTreeBuilder builder, TemplateMethod source, TemplateMethod specialization, String unexpectedValueName, boolean forceFrame,
-                    boolean includeImplicit) {
+    private void addInternalValueParameterNames(CodeTreeBuilder builder, TemplateMethod source, TemplateMethod specialization, String unexpectedValueName, boolean forceFrame, boolean includeImplicit) {
         if (forceFrame && specialization.getSpecification().findParameterSpec("frame") != null) {
             builder.string("frameValue");
         }
@@ -126,12 +125,12 @@
         }
     }
 
-    private static String valueName(ActualParameter sourceParameter, ActualParameter targetParameter) {
+    private String valueName(ActualParameter sourceParameter, ActualParameter targetParameter) {
         if (sourceParameter != null) {
             if (!sourceParameter.getSpecification().isSignature()) {
                 return valueName(targetParameter);
             } else if (sourceParameter.getTypeSystemType() != null && targetParameter.getTypeSystemType() != null) {
-                if (sourceParameter.getTypeSystemType().needsCastTo(targetParameter.getTypeSystemType())) {
+                if (sourceParameter.getTypeSystemType().needsCastTo(getContext(), targetParameter.getTypeSystemType())) {
                     return castValueName(targetParameter);
                 }
             }
@@ -324,7 +323,7 @@
                     }
                     TypeData sourceType = sourceParameter.getTypeSystemType();
 
-                    if (sourceType.needsCastTo(targetType)) {
+                    if (sourceType.needsCastTo(getContext(), targetType)) {
                         valuesNeedsCast.add(targetParameter.getLocalName());
                     }
                 }
@@ -469,7 +468,7 @@
         TypeData targetType = target.getTypeSystemType();
         TypeData sourceType = source.getTypeSystemType();
 
-        if (!sourceType.needsCastTo(targetType)) {
+        if (!sourceType.needsCastTo(getContext(), targetType)) {
             return null;
         }
 
@@ -501,7 +500,7 @@
         TypeData sourceType = source.getTypeSystemType();
         TypeData targetType = target.getTypeSystemType();
 
-        if (!sourceType.needsCastTo(targetType)) {
+        if (!sourceType.needsCastTo(getContext(), targetType)) {
             return null;
         }
 
@@ -1639,7 +1638,7 @@
 
                 if (targetType == null || sourceType == null) {
                     builder.tree(returnBuilder.getRoot());
-                } else if (sourceType.needsCastTo(targetType)) {
+                } else if (sourceType.needsCastTo(getContext(), targetType)) {
                     builder.tree(createCallTypeSystemMethod(context, parent, node, TypeSystemCodeGenerator.expectTypeMethodName(targetType), returnBuilder.getRoot()));
                 } else {
                     builder.tree(returnBuilder.getRoot());
@@ -1684,7 +1683,7 @@
                 CodeTree executionExpression = null;
                 if (cast || sourceParameter != null) {
                     TypeData sourceType = sourceParameter.getTypeSystemType();
-                    if (!sourceType.needsCastTo(targetType)) {
+                    if (!sourceType.needsCastTo(getContext(), targetType)) {
                         if (field.isShortCircuit() && sourceParameter != null) {
                             builder.tree(createShortCircuitValue(builder, specialization, field, targetParameter.getPreviousParameter(), unexpectedParameter));
                         }
@@ -1726,7 +1725,7 @@
             CodeTreeBuilder builder = new CodeTreeBuilder(parent);
             boolean unexpected = targetExecutable.hasUnexpectedValue(getContext());
             boolean cast = false;
-            if (targetExecutable.getType().needsCastTo(param.getTypeSystemType())) {
+            if (targetExecutable.getType().needsCastTo(getContext(), param.getTypeSystemType())) {
                 unexpected = true;
                 cast = true;
             }
@@ -1750,7 +1749,7 @@
             }
             builder.string(" = ");
             if (cast) {
-                builder.tree(createExpectType(specialization.getNode(), specialization.getReturnSignature(), body));
+                builder.tree(createExpectType(specialization.getNode(), param.getTypeSystemType(), body));
             } else {
                 builder.tree(body);
             }
@@ -1807,17 +1806,17 @@
                     if (index < signatureParameters.size()) {
                         ActualParameter specializationParam = signatureParameters.get(index);
 
+                        TypeData targetType = parameter.getTypeSystemType();
+                        TypeData sourceType = specializationParam.getTypeSystemType();
                         String localName = specializationParam.getLocalName();
                         if (unexpectedParameter != null && unexpectedParameter.getLocalName().equals(specializationParam.getLocalName())) {
                             localName = "ex.getResult()";
+                            sourceType = getModel().getNode().getTypeSystem().getGenericTypeData();
                         }
 
-                        TypeData sourceType = specializationParam.getTypeSystemType();
-                        TypeData targetType = parameter.getTypeSystemType();
-
                         CodeTree value = CodeTreeBuilder.singleString(localName);
 
-                        if (sourceType.needsCastTo(targetType)) {
+                        if (sourceType.needsCastTo(getContext(), targetType)) {
                             value = createCallTypeSystemMethod(getContext(), builder, getModel().getNode(), TypeSystemCodeGenerator.asTypeMethodName(targetType), value);
                         }
                         builder.tree(value);
diff -r 46f2b152d249 -r 9fde96e0c96b graal/com.oracle.truffle.codegen.processor/src/com/oracle/truffle/codegen/processor/node/SpecializationData.java
--- a/graal/com.oracle.truffle.codegen.processor/src/com/oracle/truffle/codegen/processor/node/SpecializationData.java	Thu Apr 25 20:00:23 2013 +0200
+++ b/graal/com.oracle.truffle.codegen.processor/src/com/oracle/truffle/codegen/processor/node/SpecializationData.java	Thu Apr 25 20:10:49 2013 +0200
@@ -93,6 +93,10 @@
             if (type.hasUnexpectedValue(context)) {
                 return true;
             }
+            if (type.getReturnType().getTypeSystemType().needsCastTo(context, parameter.getTypeSystemType())) {
+                return true;
+            }
+
         }
         return false;
     }
diff -r 46f2b152d249 -r 9fde96e0c96b graal/com.oracle.truffle.codegen.processor/src/com/oracle/truffle/codegen/processor/typesystem/TypeData.java
--- a/graal/com.oracle.truffle.codegen.processor/src/com/oracle/truffle/codegen/processor/typesystem/TypeData.java	Thu Apr 25 20:00:23 2013 +0200
+++ b/graal/com.oracle.truffle.codegen.processor/src/com/oracle/truffle/codegen/processor/typesystem/TypeData.java	Thu Apr 25 20:10:49 2013 +0200
@@ -110,13 +110,15 @@
         return Utils.typeEquals(boxedType, actualTypeData.boxedType);
     }
 
-    public boolean needsCastTo(TypeData targetType) {
+    public boolean needsCastTo(ProcessorContext context, TypeData targetType) {
         if (this.equals(targetType)) {
             return false;
         } else if (targetType.isGeneric()) {
             return false;
         } else if (targetType.isVoid()) {
             return false;
+        } else if (Utils.isAssignable(context, getPrimitiveType(), targetType.getPrimitiveType())) {
+            return false;
         }
         return true;
     }