Mercurial > hg > graal-compiler
changeset 2711:fb4cc9812591
Fix for last merge
author | Gilles Duboscq <gilles.duboscq@oracle.com> |
---|---|
date | Thu, 19 May 2011 12:03:11 +0200 |
parents | 0efd77a02ea9 |
children | 95e2aa413d95 |
files | graal/GraalCompiler/src/com/sun/c1x/graph/GraphBuilder.java |
diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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) {