Mercurial > hg > graal-compiler
changeset 19763:d03352ba2efb
Truffle-DSL: fix another null issue for execute method generation.
author | Christian Humer <christian.humer@gmail.com> |
---|---|
date | Tue, 10 Mar 2015 13:47:46 +0100 |
parents | 223e1d7b15b7 |
children | e8d2f3f95dcd |
files | graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/generator/NodeGenFactory.java |
diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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 {