Mercurial > hg > truffle

comparison graal/GraalCompiler/src/com/sun/c1x/graph/GraphBuilder.java @ 2711:fb4cc9812591

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix for last merge
author Gilles Duboscq <gilles.duboscq@oracle.com>
date Thu, 19 May 2011 12:03:11 +0200
parents 0efd77a02ea9
children 95e2aa413d95
comparison
equal deleted inserted replaced
2710:0efd77a02ea9 2711:fb4cc9812591
342 ExceptionDispatch end = new ExceptionDispatch(null, handler.entryBlock(), null, handler, null, false, graph); 342 ExceptionDispatch end = new ExceptionDispatch(null, handler.entryBlock(), null, handler, null, false, graph);
343 end.setBlockSuccessor(0, successor); 343 end.setBlockSuccessor(0, successor);
344 dispatchEntry.appendNext(end, handler.handlerBCI()); 344 dispatchEntry.appendNext(end, handler.handlerBCI());
345 dispatchEntry.setEnd(end); 345 dispatchEntry.setEnd(end);
346 } else { 346 } else {
347 Deoptimize deopt = new Deoptimize(graph, null); 347 Deoptimize deopt = new Deoptimize(graph);
348 dispatchEntry.appendNext(deopt, bci); 348 dispatchEntry.appendNext(deopt, bci);
349 Goto end = new Goto(successor, null, false, graph); 349 Goto end = new Goto(successor, null, false, graph);
350 deopt.appendNext(end, bci); 350 deopt.appendNext(end, bci);
351 dispatchEntry.setEnd(end); 351 dispatchEntry.setEnd(end);
352 } 352 }
393 dispatch.catchSuccessor().setStateBefore(mergedState.duplicate(bci)); 393 dispatch.catchSuccessor().setStateBefore(mergedState.duplicate(bci));
394 updateDispatchChain(dispatch.otherSuccessor(), mergedState, bci); 394 updateDispatchChain(dispatch.otherSuccessor(), mergedState, bci);
395 } else if (dispatchEntry.next() instanceof Deoptimize) { 395 } else if (dispatchEntry.next() instanceof Deoptimize) {
396 // deoptimizing handler 396 // deoptimizing handler
397 Deoptimize deopt = (Deoptimize) dispatchEntry.next(); 397 Deoptimize deopt = (Deoptimize) dispatchEntry.next();
398 deopt.setStateBefore(mergedState.duplicate(bci)); 398 //deopt.setStateBefore(mergedState.duplicate(bci));
399 dispatchEntry.end().setStateAfter(mergedState.duplicate(bci)); 399 dispatchEntry.end().setStateAfter(mergedState.duplicate(bci));
400 updateDispatchChain(dispatchEntry.end().blockSuccessor(0), mergedState, bci); 400 updateDispatchChain(dispatchEntry.end().blockSuccessor(0), mergedState, bci);
401 } else if (dispatchEntry.next() instanceof Unwind) { 401 } else if (dispatchEntry.next() instanceof Unwind) {
402 // unwind handler 402 // unwind handler
403 Unwind unwind = (Unwind) dispatchEntry.next(); 403 Unwind unwind = (Unwind) dispatchEntry.next();