Mercurial > hg > truffle

changeset 18166:44dab78fe6bb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Truffle: do not throw permament compiler exceptions into guest languages.
author Chris Seaton <chris.seaton@oracle.com>
date Fri, 24 Oct 2014 22:53:42 +0100
parents afbb8100ac92
children 2bf5ea10eea7
files graal/com.oracle.graal.truffle.hotspot/src/com/oracle/graal/truffle/hotspot/HotSpotTruffleRuntime.java
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	Fri Oct 24 22:51:53 2014 +0100
+++ b/graal/com.oracle.graal.truffle.hotspot/src/com/oracle/graal/truffle/hotspot/HotSpotTruffleRuntime.java	Fri Oct 24 22:53:42 2014 +0100
@@ -219,7 +219,7 @@
             try {
                 future.get();
             } catch (ExecutionException e) {
-                if (TruffleCompilationExceptionsAreThrown.getValue() && !(e.getCause() instanceof BailoutException)) {
+                if (TruffleCompilationExceptionsAreThrown.getValue() && !(e.getCause() instanceof BailoutException) && !((BailoutException) e.getCause()).isPermanent()) {
                     throw new RuntimeException(e.getCause());
                 } else {
                     // silently ignored