# HG changeset patch
# User Gilles Duboscq <gilles.duboscq@oracle.com>
# Date 1305799391 -7200
# Node ID fb4cc981259189cb4906f41362d61f27503baa7f
# Parent  0efd77a02ea9787a789f531bcc5e3c9c3078d566
Fix for last merge

diff -r 0efd77a02ea9 -r fb4cc9812591 graal/GraalCompiler/src/com/sun/c1x/graph/GraphBuilder.java
--- a/graal/GraalCompiler/src/com/sun/c1x/graph/GraphBuilder.java	Thu May 19 11:43:30 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/graph/GraphBuilder.java	Thu May 19 12:03:11 2011 +0200
@@ -344,7 +344,7 @@
                         dispatchEntry.appendNext(end, handler.handlerBCI());
                         dispatchEntry.setEnd(end);
                     } else {
-                        Deoptimize deopt = new Deoptimize(graph, null);
+                        Deoptimize deopt = new Deoptimize(graph);
                         dispatchEntry.appendNext(deopt, bci);
                         Goto end = new Goto(successor, null, false, graph);
                         deopt.appendNext(end, bci);
@@ -395,7 +395,7 @@
         } else if (dispatchEntry.next() instanceof Deoptimize) {
             // deoptimizing handler
             Deoptimize deopt = (Deoptimize) dispatchEntry.next();
-            deopt.setStateBefore(mergedState.duplicate(bci));
+            //deopt.setStateBefore(mergedState.duplicate(bci));
             dispatchEntry.end().setStateAfter(mergedState.duplicate(bci));
             updateDispatchChain(dispatchEntry.end().blockSuccessor(0), mergedState, bci);
         } else if (dispatchEntry.next() instanceof Unwind) {