# HG changeset patch # User Thomas Wuerthinger # Date 1305732734 -7200 # Node ID d669ab61c7c726f6f7dabd3b0b5b6dcb91afaa7b # Parent efbdb3ea95c9c6e101fd80f532af50c1d03f92e1 Removed IsOnWorklistFlag diff -r efbdb3ea95c9 -r d669ab61c7c7 graal/GraalCompiler/src/com/sun/c1x/graph/GraphBuilder.java --- a/graal/GraalCompiler/src/com/sun/c1x/graph/GraphBuilder.java Wed May 18 17:27:06 2011 +0200 +++ b/graal/GraalCompiler/src/com/sun/c1x/graph/GraphBuilder.java Wed May 18 17:32:14 2011 +0200 @@ -205,7 +205,7 @@ // 4A.3 setup an exception handler to unlock the root method synchronized object syncHandler = new BlockBegin(Instruction.SYNCHRONIZATION_ENTRY_BCI, ir.nextBlockNumber(), graph); syncHandler.setExceptionEntry(); - syncHandler.setBlockFlag(BlockBegin.BlockFlag.IsOnWorkList); + markOnWorkList(syncHandler); ExceptionHandler h = new ExceptionHandler(new CiExceptionHandler(0, rootMethod.code().length, -1, 0, null)); h.setEntryBlock(syncHandler); @@ -227,6 +227,16 @@ } } + private Set blocksOnWorklist = new HashSet(); + + private void markOnWorkList(BlockBegin block) { + blocksOnWorklist.add(block); + } + + private boolean isOnWorkList(BlockBegin block) { + return blocksOnWorklist.contains(block); + } + private void finishStartBlock(BlockBegin startBlock, BlockBegin stdEntry) { assert curBlock == startBlock; FrameState stateAfter = frameState.create(bci()); @@ -1404,8 +1414,8 @@ * @param block the block to add to the work list */ private void addToWorkList(BlockBegin block) { - if (!block.isOnWorkList()) { - block.setOnWorkList(true); + if (!isOnWorkList(block)) { + markOnWorkList(block); sortIntoWorkList(block); } } diff -r efbdb3ea95c9 -r d669ab61c7c7 graal/GraalCompiler/src/com/sun/c1x/ir/BlockBegin.java --- a/graal/GraalCompiler/src/com/sun/c1x/ir/BlockBegin.java Wed May 18 17:27:06 2011 +0200 +++ b/graal/GraalCompiler/src/com/sun/c1x/ir/BlockBegin.java Wed May 18 17:32:14 2011 +0200 @@ -95,7 +95,6 @@ StandardEntry, ExceptionEntry, BackwardBranchTarget, - IsOnWorkList, WasVisited, ParserLoopHeader, LinearScanLoopHeader, @@ -467,14 +466,6 @@ setBlockFlag(BlockFlag.ExceptionEntry); } - public boolean isOnWorkList() { - return checkBlockFlag(BlockFlag.IsOnWorkList); - } - - public void setOnWorkList(boolean value) { - setBlockFlag(BlockFlag.IsOnWorkList, value); - } - public boolean wasVisited() { return checkBlockFlag(BlockFlag.WasVisited); }