Mercurial > hg > graal-compiler

changeset 17078:c4b1cf38002b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Truffle: TruffleCompilationExceptionsAreThrown option to get OptimizationFailedException on compiler error.
author Chris Seaton <chris.seaton@oracle.com>
date Tue, 09 Sep 2014 20:19:23 +0100
parents 0a210ccd3bd3
children b06b4dee86d5
files graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/OptimizedCallTarget.java graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleCompilerOptions.java graal/com.oracle.truffle.api/src/com/oracle/truffle/api/OptimizationFailedException.java
diffstat 3 files changed, 44 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/OptimizedCallTarget.java	Tue Sep 09 14:05:28 2014 +0200
+++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/OptimizedCallTarget.java	Tue Sep 09 20:19:23 2014 +0100
@@ -273,14 +273,15 @@
             // Compilation was successful.
         } else {
             compilationPolicy.recordCompilationFailure(t);
-            logOptimizingFailed(this, t.getMessage());
             if (t instanceof BailoutException) {
+                logOptimizingFailed(this, t.getMessage());
                 // Bailout => move on.
-            } else {
-                if (TruffleCompilationExceptionsAreFatal.getValue()) {
-                    t.printStackTrace(OUT);
-                    System.exit(-1);
-                }
+            } else if (TruffleCompilationExceptionsAreFatal.getValue()) {
+                logOptimizingFailed(this, t.getMessage());
+                t.printStackTrace(OUT);
+                System.exit(-1);
+            } else if (TruffleCompilationExceptionsAreThrown.getValue()) {
+                throw new OptimizationFailedException(t);
             }
         }
     }
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleCompilerOptions.java	Tue Sep 09 14:05:28 2014 +0200
+++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleCompilerOptions.java	Tue Sep 09 20:19:23 2014 +0100
@@ -116,6 +116,8 @@
     @Option(help = "")
     public static final OptionValue<Boolean> TruffleCompilationExceptionsAreFatal = new OptionValue<>(false);
     @Option(help = "")
+    public static final OptionValue<Boolean> TruffleCompilationExceptionsAreThrown = new OptionValue<>(false);
+    @Option(help = "")
     public static final OptionValue<Boolean> TraceTruffleInlining = new OptionValue<>(false);
     @Option(help = "")
     public static final OptionValue<Boolean> TraceTruffleSplitting = new OptionValue<>(false);
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/OptimizationFailedException.java	Tue Sep 09 20:19:23 2014 +0100
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package com.oracle.truffle.api;
+
+public class OptimizationFailedException extends RuntimeException {
+
+    public OptimizationFailedException(Throwable cause) {
+        super(cause);
+    }
+
+    private static final long serialVersionUID = -8797188744430210785L;
+
+}