Mercurial > hg > truffle
changeset 4557:c106c5e4f621
Merge
author | Gilles Duboscq <duboscq@ssw.jku.at> |
---|---|
date | Thu, 09 Feb 2012 13:50:52 +0100 |
parents | 5d8eaed30aee (diff) 1b2abdc91451 (current diff) |
children | 3706975946e4 |
files | |
diffstat | 5 files changed, 10 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/GraalOptions.java Thu Feb 09 13:21:42 2012 +0100 +++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/GraalOptions.java Thu Feb 09 13:50:52 2012 +0100 @@ -131,7 +131,6 @@ public static boolean UseExceptionProbability = true; public static boolean AllowExplicitExceptionChecks = true; public static boolean OmitHotExceptionStacktrace = ____; - public static int MatureInvocationCount = 100; public static boolean GenSafepoints = true; public static boolean GenLoopSafepoints = true; public static boolean UseTypeCheckHints = true;
--- a/graal/com.oracle.max.graal.java/src/com/oracle/max/graal/java/BciBlockMapping.java Thu Feb 09 13:21:42 2012 +0100 +++ b/graal/com.oracle.max.graal.java/src/com/oracle/max/graal/java/BciBlockMapping.java Thu Feb 09 13:50:52 2012 +0100 @@ -388,7 +388,7 @@ case PUTFIELD: case GETFIELD: { if (GraalOptions.AllowExplicitExceptionChecks) { - return profilingInfo.getExceptionSeen(bci) != RiExceptionSeen.FALSE; + return profilingInfo.getExceptionSeen(bci) == RiExceptionSeen.TRUE; } } }
--- a/graal/com.oracle.max.graal.java/src/com/oracle/max/graal/java/GraphBuilderPhase.java Thu Feb 09 13:21:42 2012 +0100 +++ b/graal/com.oracle.max.graal.java/src/com/oracle/max/graal/java/GraphBuilderPhase.java Thu Feb 09 13:50:52 2012 +0100 @@ -322,10 +322,12 @@ private BeginNode handleException(ValueNode exceptionObject, int bci) { assert bci == FrameState.BEFORE_BCI || bci == bci() : "invalid bci"; - if (GraalOptions.UseExceptionProbability && method.invocationCount() > GraalOptions.MatureInvocationCount) { + if (GraalOptions.UseExceptionProbability) { // be conservative if information was not recorded (could result in endless recompiles otherwise) - if (bci != FrameState.BEFORE_BCI && exceptionObject == null && profilingInfo.getExceptionSeen(bci) == RiExceptionSeen.FALSE) { + if (bci != FrameState.BEFORE_BCI && exceptionObject == null && profilingInfo.getExceptionSeen(bci) != RiExceptionSeen.TRUE) { return null; + } else { + Debug.log("Creating exception edges at %d, exception object=%s, exception seen=%s", bci, exceptionObject, profilingInfo.getExceptionSeen(bci)); } }
--- a/graal/com.oracle.max.graal.tests/src/com/oracle/max/graal/compiler/tests/DegeneratedLoopsTest.java Thu Feb 09 13:21:42 2012 +0100 +++ b/graal/com.oracle.max.graal.tests/src/com/oracle/max/graal/compiler/tests/DegeneratedLoopsTest.java Thu Feb 09 13:50:52 2012 +0100 @@ -46,7 +46,7 @@ return 1; } - @Test(expected = AssertionFailedError.class) + @Test public void test1() { test("test1Snippet"); }
--- a/graal/com.oracle.max.graal.tests/src/com/oracle/max/graal/compiler/tests/NestedLoopTest.java Thu Feb 09 13:21:42 2012 +0100 +++ b/graal/com.oracle.max.graal.tests/src/com/oracle/max/graal/compiler/tests/NestedLoopTest.java Thu Feb 09 13:50:52 2012 +0100 @@ -33,22 +33,22 @@ @Test public void test1() { - test("test1Snippet", 5, 5, 4); + test("test1Snippet", 1, 2, 2); } @Test public void test2() { - test("test2Snippet", 2, 5, 4); + test("test2Snippet", 1, 2, 2); } @Test public void test3() { - test("test3Snippet", 1, 5, 4); + test("test3Snippet", 1, 2, 2); } @Test public void test4() { - test("test4Snippet", 1, 6, 4); + test("test4Snippet", 1, 3, 2); } @SuppressWarnings("all")