# HG changeset patch
# User Chris Seaton <chris.seaton@oracle.com>
# Date 1413392978 -3600
# Node ID 271fab79aecd016474c9c3d547a7f2c32e93ccb9
# Parent  594f932ade4a097827a306b1793b70eae7365daf# Parent  562643f42b65dcec2b7065ef77988b9e8a3ac9a4
Merge.

diff -r 562643f42b65 -r 271fab79aecd graal/com.oracle.graal.truffle.hotspot/src/com/oracle/graal/truffle/hotspot/HotSpotTruffleRuntime.java
--- 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