Mercurial > hg > truffle

changeset 17152:d48738c27e7d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Truffle: restore "opt fail" message on compilation failure
author Andreas Woess <andreas.woess@jku.at>
date Thu, 18 Sep 2014 19:02:02 +0200
parents e165f4223650
children 646ddd52d79a
files graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/OptimizedCallTarget.java
diffstat 1 files changed, 5 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/OptimizedCallTarget.java	Thu Sep 18 19:00:23 2014 +0200
+++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/OptimizedCallTarget.java	Thu Sep 18 19:02:02 2014 +0200
@@ -273,15 +273,16 @@
             // Compilation was successful.
         } else {
             compilationPolicy.recordCompilationFailure(t);
+
+            if (TruffleCompilationExceptionsAreThrown.getValue()) {
+                throw new OptimizationFailedException(t, rootNode);
+            }
+            logOptimizingFailed(this, t.getMessage());
             if (t instanceof BailoutException) {
-                logOptimizingFailed(this, t.getMessage());
                 // Bailout => move on.
             } else if (TruffleCompilationExceptionsAreFatal.getValue()) {
-                logOptimizingFailed(this, t.getMessage());
                 t.printStackTrace(OUT);
                 System.exit(-1);
-            } else if (TruffleCompilationExceptionsAreThrown.getValue()) {
-                throw new OptimizationFailedException(t, rootNode);
             }
         }
     }