--- a/graal/GraalCompiler/src/com/sun/c1x/graph/GraphBuilder.java	Tue May 31 13:41:47 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/graph/GraphBuilder.java	Tue May 31 13:42:01 2011 +0200
@@ -611,7 +611,7 @@
         append(new NullCheck(exception, graph));
         Instruction entry = handleException(exception, bci);
         if (entry == null) {
-            entry = new Unwind(exception, graph);
+            entry = new Unwind(exception, graph.end(), graph);
         }
         append(entry);
     }
@@ -1080,7 +1080,7 @@
 
         // Exit the monitor and unwind the stack.
         genMonitorExit(lock);
-        append(new Unwind(frameState.apop(), graph));
+        append(new Unwind(frameState.apop(), graph.end(), graph));
 
         // The sync handler is always the last thing to add => we can clear the frameState.
         frameState = null;
@@ -1149,7 +1149,7 @@
                 append(new MonitorExit(rootMethodSynchronizedObject, lockAddress, lockNumber, graph));
                 frameState.unlock();
             }
-            append(new Unwind(frameState.apop(), graph));
+            append(new Unwind(frameState.apop(), graph.end(), graph));
         } else {
             assert frameState.stackSize() == 1;