# HG changeset patch # User Thomas Wuerthinger # Date 1397828473 -7200 # Node ID 2a8628bc6c107fd40c4be9c4d4d1e9cc2b1464e8 # Parent d49a8fe10727d7b28004fcf8b6efef8bc58152c1 Truffle: Allow null as a possible return value. diff -r d49a8fe10727 -r 2a8628bc6c10 graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/OptimizedCallTarget.java --- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/OptimizedCallTarget.java Fri Apr 18 15:19:06 2014 +0200 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/OptimizedCallTarget.java Fri Apr 18 15:41:13 2014 +0200 @@ -275,7 +275,7 @@ if (profiledReturnTypeAssumption == null) { if (TruffleReturnTypeSpeculation.getValue()) { CompilerDirectives.transferToInterpreter(); - profiledReturnType = result.getClass(); + profiledReturnType = (result == null ? null : result.getClass()); profiledReturnTypeAssumption = Truffle.getRuntime().createAssumption("Profiled Return Type"); } } else if (profiledReturnType != null) {