# HG changeset patch
# User Chris Seaton <chris.seaton@oracle.com>
# Date 1413219890 -3600
# Node ID 4263c17d4b8c77998ed7a5cbea3639042e078f23
# Parent  34f6995b1d90f4ff94acb909e5f6f3eddcb59001# Parent  89f801a9b4d47f9fbe5ea3c7050dbe90a8634613
Merge.

diff -r 89f801a9b4d4 -r 4263c17d4b8c 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	Mon Oct 13 17:49:09 2014 +0200
+++ b/graal/com.oracle.graal.truffle.hotspot/src/com/oracle/graal/truffle/hotspot/HotSpotTruffleRuntime.java	Mon Oct 13 18:04:50 2014 +0100
@@ -209,7 +209,13 @@
         if (!mayBeAsynchronous) {
             try {
                 future.get();
-            } catch (InterruptedException | ExecutionException e) {
+            } catch (ExecutionException e) {
+                if (TruffleCompilationExceptionsAreThrown.getValue()) {
+                    throw new RuntimeException(e.getCause());
+                } else {
+                    // silently ignored
+                }
+            } catch (InterruptedException e) {
                 // silently ignored
             }
         }
diff -r 89f801a9b4d4 -r 4263c17d4b8c 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	Mon Oct 13 17:49:09 2014 +0200
+++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/OptimizedCallTarget.java	Mon Oct 13 18:04:50 2014 +0100
@@ -294,7 +294,7 @@
     public void compile() {
         if (!runtime.isCompiling(this)) {
             logOptimizingQueued(this);
-            runtime.compile(this, TruffleBackgroundCompilation.getValue());
+            runtime.compile(this, TruffleBackgroundCompilation.getValue() && !TruffleCompilationExceptionsAreThrown.getValue());
         }
     }