Mercurial > hg > truffle
changeset 2672:35453d725a2a
Add a BailoutOnException option on C1X to be able to tell expected exceptions (bailouts on jsr etc.) appart from true/unexpected exceptions
| author | Gilles Duboscq <gilles.duboscq@oracle.com> |
|---|---|
| date | Thu, 12 May 2011 17:57:58 +0200 |
| parents | d8601d421b96 |
| children | 98447ab8bd83 bcd20d26d52d |
| files | graal/GraalCompiler/src/com/sun/c1x/C1XCompilation.java graal/GraalCompiler/src/com/sun/c1x/C1XOptions.java rundacapo.sh |
| diffstat | 3 files changed, 7 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/GraalCompiler/src/com/sun/c1x/C1XCompilation.java Thu May 12 17:17:50 2011 +0200 +++ b/graal/GraalCompiler/src/com/sun/c1x/C1XCompilation.java Thu May 12 17:57:58 2011 +0200 @@ -218,7 +218,11 @@ } catch (CiBailout b) { return new CiResult(null, b, stats); } catch (Throwable t) { - return new CiResult(null, new CiBailout("Exception while compiling: " + method, t), stats); + if (C1XOptions.BailoutOnException) { + return new CiResult(null, new CiBailout("Exception while compiling: " + method, t), stats); + } else { + throw new RuntimeException(t); + } } finally { if (compiler.isObserved()) { compiler.fireCompilationFinished(new CompilationEvent(this));
--- a/graal/GraalCompiler/src/com/sun/c1x/C1XOptions.java Thu May 12 17:17:50 2011 +0200 +++ b/graal/GraalCompiler/src/com/sun/c1x/C1XOptions.java Thu May 12 17:57:58 2011 +0200 @@ -55,6 +55,7 @@ public static int MethodEndBreakpointGuards = 0; public static boolean ZapStackOnMethodEntry = ____; public static boolean StressLinearScan = ____; + public static boolean BailoutOnException = ____; /** * See {@link Filter#Filter(String, Object)}.
--- a/rundacapo.sh Thu May 12 17:17:50 2011 +0200 +++ b/rundacapo.sh Thu May 12 17:57:58 2011 +0200 @@ -15,4 +15,4 @@ echo "DACAPO is not defined. It must point to a Dacapo benchmark directory." exit 1; fi -${JDK7}/bin/java -client -d64 -graal -XX:-C1XBailoutIsFatal -XX:+PrintCompilation -C1X:-QuietBailout -Xms1g -Xmx2g -esa -classpath ${DACAPO}/dacapo-9.12-bach.jar Harness $* +${JDK7}/bin/java -client -d64 -graal -XX:-C1XBailoutIsFatal -XX:-PrintCompilation -C1X:+QuietBailout -Xms1g -Xmx2g -esa -classpath ${DACAPO}/dacapo-9.12-bach.jar Harness $*