Mercurial > hg > truffle
changeset 17597:271fab79aecd
Merge.
author | Chris Seaton <chris.seaton@oracle.com> |
---|---|
date | Wed, 15 Oct 2014 18:09:38 +0100 |
parents | 594f932ade4a (diff) 562643f42b65 (current diff) |
children | a3464d86b5d2 |
files | |
diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.truffle.hotspot/src/com/oracle/graal/truffle/hotspot/HotSpotTruffleRuntime.java Wed Oct 15 12:04:20 2014 +0200 +++ b/graal/com.oracle.graal.truffle.hotspot/src/com/oracle/graal/truffle/hotspot/HotSpotTruffleRuntime.java Wed Oct 15 18:09:38 2014 +0100 @@ -210,7 +210,7 @@ try { future.get(); } catch (ExecutionException e) { - if (TruffleCompilationExceptionsAreThrown.getValue()) { + if (TruffleCompilationExceptionsAreThrown.getValue() && !(e.getCause() instanceof BailoutException)) { throw new RuntimeException(e.getCause()); } else { // silently ignored