--- a/graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/generator/NodeGenFactory.java	Wed Apr 15 00:35:25 2015 +0200
+++ b/graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/generator/NodeGenFactory.java	Wed Apr 15 03:14:27 2015 +0200
@@ -1696,7 +1696,6 @@
                 var = currentLocals.createValue(execution, targetType).nextName();
                 builder.tree(createAssignExecuteChild(builder, execution, executableType, var, shortCircuit, currentLocals));
                 currentLocals.setValue(execution, var);
-
             }
         }
 
@@ -1719,7 +1718,7 @@
             };
             builder.tree(createGuardAndCast(group, returnType, currentLocals, executionFactory));
             if (hasFallthrough(group, returnType, originalValues, true, null) || group.getSpecialization().isFallback()) {
-                builder.tree(createCallNext(builder, executableType, executableType, originalValues));
+                builder.tree(createCallNext(builder, executableType, node.getGenericExecutableType(executableType), originalValues));
             }
         }
         return builder.build();