# HG changeset patch # User Thomas Wuerthinger # Date 1305817470 -7200 # Node ID 1ddcbcd33325f8d5cb6a22335d947132af437617 # Parent 819a40e46826bdee618c9bd1123746c03721b59e Clean up. diff -r 819a40e46826 -r 1ddcbcd33325 graal/GraalCompiler/src/com/sun/c1x/gen/LIRGenerator.java --- a/graal/GraalCompiler/src/com/sun/c1x/gen/LIRGenerator.java Thu May 19 17:02:12 2011 +0200 +++ b/graal/GraalCompiler/src/com/sun/c1x/gen/LIRGenerator.java Thu May 19 17:04:30 2011 +0200 @@ -598,7 +598,7 @@ } } - private LIRBlock getLIRBlock(BlockBegin b) { + protected LIRBlock getLIRBlock(BlockBegin b) { return b.lirBlock(); } diff -r 819a40e46826 -r 1ddcbcd33325 graal/GraalCompiler/src/com/sun/c1x/ir/BlockBegin.java --- a/graal/GraalCompiler/src/com/sun/c1x/ir/BlockBegin.java Thu May 19 17:02:12 2011 +0200 +++ b/graal/GraalCompiler/src/com/sun/c1x/ir/BlockBegin.java Thu May 19 17:04:30 2011 +0200 @@ -115,7 +115,7 @@ this.blockID = blockID; depthFirstNumber = -1; linearScanNumber = -1; - setBCI(bci); + this.bci = bci; } /** @@ -232,14 +232,6 @@ return bci; } - /** - * Sets the bytecode index of this instruction. - * @param bci the new bytecode index for this instruction - */ - public void setBCI(int bci) { - this.bci = bci; - } - private void iterate(IdentityHashMap mark, BlockClosure closure) { if (!mark.containsKey(this)) { mark.put(this, this); diff -r 819a40e46826 -r 1ddcbcd33325 graal/GraalCompiler/src/com/sun/c1x/target/amd64/AMD64LIRGenerator.java --- a/graal/GraalCompiler/src/com/sun/c1x/target/amd64/AMD64LIRGenerator.java Thu May 19 17:02:12 2011 +0200 +++ b/graal/GraalCompiler/src/com/sun/c1x/target/amd64/AMD64LIRGenerator.java Thu May 19 17:04:30 2011 +0200 @@ -514,10 +514,6 @@ lir.jump(getLIRBlock(x.defaultSuccessor())); } - private LIRBlock getLIRBlock(BlockBegin b) { - return b.lirBlock(); - } - @Override public void visitExceptionDispatch(ExceptionDispatch x) { // TODO ls: this needs some more work...