Mercurial > hg > graal-jvmci-8
changeset 2670:50b181d88c9f
Merge.
author | Thomas Wuerthinger <thomas@wuerthinger.net> |
---|---|
date | Thu, 12 May 2011 17:00:09 +0200 |
parents | 405e7947a940 (diff) 32e8315bb6e4 (current diff) |
children | d8601d421b96 |
files | graal/GraalCompiler/src/com/sun/c1x/gen/LIRGenerator.java rundacapo.sh |
diffstat | 3 files changed, 5 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/GraalCompiler/src/com/sun/c1x/gen/LIRGenerator.java Thu May 12 12:13:17 2011 +0200 +++ b/graal/GraalCompiler/src/com/sun/c1x/gen/LIRGenerator.java Thu May 12 17:00:09 2011 +0200 @@ -975,15 +975,10 @@ return operand; } - private FrameState stateBeforeRegisterFinalizer(RegisterFinalizer rf) { - assert rf.object().kind == CiKind.Object; - return rf.stateAfter().duplicateModified(rf.bci(), CiKind.Void, rf.object()); - } - @Override public void visitRegisterFinalizer(RegisterFinalizer x) { CiValue receiver = load(x.object()); - LIRDebugInfo info = stateFor(x, stateBeforeRegisterFinalizer(x)); + LIRDebugInfo info = stateFor(x, x.stateBefore()); callRuntime(CiRuntimeCall.RegisterFinalizer, info, receiver); setNoResult(x); }
--- a/graal/GraalCompiler/src/com/sun/c1x/graph/GraphBuilder.java Thu May 12 12:13:17 2011 +0200 +++ b/graal/GraalCompiler/src/com/sun/c1x/graph/GraphBuilder.java Thu May 12 17:00:09 2011 +0200 @@ -812,7 +812,9 @@ if (needsCheck) { // append a call to the finalizer registration - append(new RegisterFinalizer(frameState.loadLocal(0), graph)); + RegisterFinalizer r = new RegisterFinalizer(frameState.loadLocal(0), graph); + append(r); + r.setStateBefore(frameState.create(bci())); C1XMetrics.InlinedFinalizerChecks++; } }
--- a/rundacapo.sh Thu May 12 12:13:17 2011 +0200 +++ b/rundacapo.sh Thu May 12 17:00:09 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 -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 $*