# HG changeset patch
# User Christian Humer <christian.humer@gmail.com>
# Date 1425991666 -3600
# Node ID d03352ba2efb66da57267109820f21a1ec605f7c
# Parent  223e1d7b15b75b3a619841ac3741e30db64843ee
Truffle-DSL: fix another null issue for execute method generation.

diff -r 223e1d7b15b7 -r d03352ba2efb graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/generator/NodeGenFactory.java
--- a/graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/generator/NodeGenFactory.java	Tue Mar 10 19:19:33 2015 +0100
+++ b/graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/generator/NodeGenFactory.java	Tue Mar 10 13:47:46 2015 +0100
@@ -871,7 +871,7 @@
 
             CodeTreeBuilder contentBuilder = builder.create();
             contentBuilder.startReturn();
-            if (!hasExecutedUnexpected) {
+            if (!hasExecutedUnexpected && !execType.hasUnexpectedValue(context)) {
                 if (executedType == null || executedType.needsCastTo(returnType)) {
                     contentBuilder.cast(returnType.getPrimitiveType(), executeBuilder.build());
                 } else {