Mercurial > hg > truffle

changeset 17425:4263c17d4b8c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge.
author Chris Seaton <chris.seaton@oracle.com>
date Mon, 13 Oct 2014 18:04:50 +0100
parents 34f6995b1d90 (diff) 89f801a9b4d4 (current diff)
children de120499a936
files graal/com.oracle.graal.truffle.hotspot/src/com/oracle/graal/truffle/hotspot/HotSpotTruffleRuntime.java graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/OptimizedCallTarget.java
diffstat 2 files changed, 8 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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
             }
         }
--- 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());
         }
     }