# HG changeset patch
# User Roland Schatz <roland.schatz@oracle.com>
# Date 1363708899 -3600
# Node ID 2543392b9197e5a6b26a6af05cc69ebeabe55d39
# Parent  fd9488c692506111e0e6a74d570721fa92e77ab3# Parent  40eaf9970bff5b8e1dc686495abbd74d6303d9ae
Merge.

diff -r 40eaf9970bff -r 2543392b9197 graal/com.oracle.graal.java/src/com/oracle/graal/java/GraphBuilderPhase.java
--- 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);
     }
diff -r 40eaf9970bff -r 2543392b9197 graal/com.oracle.graal.snippets/src/com/oracle/graal/snippets/SnippetIntrinsificationPhase.java
--- 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) {