Mercurial > hg > graal-jvmci-8
changeset 8380:2543392b9197
Merge.
author | Roland Schatz <roland.schatz@oracle.com> |
---|---|
date | Tue, 19 Mar 2013 17:01:39 +0100 |
parents | fd9488c69250 (diff) 40eaf9970bff (current diff) |
children | 807fd844ed2a b4dea2fa8d9b |
files | graal/com.oracle.graal.compiler.amd64.test/src/com/oracle/graal/compiler/amd64/test/AMD64FrameOmissionTest.java graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/HotSpotAMD64LIRGenerator.java |
diffstat | 2 files changed, 1 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.java/src/com/oracle/graal/java/GraphBuilderPhase.java Tue Mar 19 15:58:01 2013 +0100 +++ b/graal/com.oracle.graal.java/src/com/oracle/graal/java/GraphBuilderPhase.java Tue Mar 19 17:01:39 2013 +0100 @@ -1552,10 +1552,10 @@ private void createUnwind() { assert frameState.stackSize() == 1 : frameState; - synchronizedEpilogue(FrameState.AFTER_EXCEPTION_BCI); ValueNode exception = frameState.apop(); FixedGuardNode guard = currentGraph.add(new FixedGuardNode(currentGraph.unique(new IsNullNode(exception)), NullCheckException, InvalidateReprofile, true)); append(guard); + synchronizedEpilogue(FrameState.AFTER_EXCEPTION_BCI); UnwindNode unwindNode = currentGraph.add(new UnwindNode(exception)); append(unwindNode); }
--- a/graal/com.oracle.graal.snippets/src/com/oracle/graal/snippets/SnippetIntrinsificationPhase.java Tue Mar 19 15:58:01 2013 +0100 +++ b/graal/com.oracle.graal.snippets/src/com/oracle/graal/snippets/SnippetIntrinsificationPhase.java Tue Mar 19 17:01:39 2013 +0100 @@ -358,8 +358,6 @@ } else if (checkCastUsage instanceof MethodCallTargetNode) { MethodCallTargetNode checkCastCallTarget = (MethodCallTargetNode) checkCastUsage; if (pool.isUnboxingMethod(checkCastCallTarget.targetMethod())) { - assert pool.isUnboxingMethod(checkCastCallTarget.targetMethod()) : "checkcast at " + sourceLocation(checkCastNode) + " not used by an unboxing method but by a call at " + - sourceLocation(checkCastCallTarget.usages().first()) + " to " + checkCastCallTarget.targetMethod(); Invoke invokeNode = checkCastCallTarget.invoke(); invokeNode.node().replaceAtUsages(newInstance); if (invokeNode instanceof InvokeWithExceptionNode) {