--- a/graal/GraalCompiler/src/com/sun/c1x/alloc/LinearScan.java	Thu May 19 16:56:05 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/alloc/LinearScan.java	Thu May 19 17:02:12 2011 +0200
@@ -110,7 +110,7 @@
 
     /**
      * Map from an instruction {@linkplain LIRInstruction#id id} to the {@linkplain
-     * BlockBegin block} containing the instruction. Entries should be retrieved with
+     * LIRBlock block} containing the instruction. Entries should be retrieved with
      * {@link #blockForId(int)} as the id is not simply an index into this array.
      */
     LIRBlock[] opIdToBlockMap;

--- a/graal/GraalCompiler/src/com/sun/c1x/debug/CFGPrinter.java	Thu May 19 16:56:05 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/debug/CFGPrinter.java	Thu May 19 17:02:12 2011 +0200
@@ -159,7 +159,7 @@
         }
 
         if (printLIR) {
-            printLIR(block);
+            printLIR(block.lirBlock());
         }
 
         end("block");
@@ -465,7 +465,7 @@
      *
      * @param block the block to print
      */
-    private void printLIR(BlockBegin block) {
+    private void printLIR(LIRBlock block) {
         LIRList lir = block.lir();
         if (lir != null) {
             begin("IR");

--- a/graal/GraalCompiler/src/com/sun/c1x/ir/BlockBegin.java	Thu May 19 16:56:05 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/ir/BlockBegin.java	Thu May 19 17:02:12 2011 +0200
@@ -74,8 +74,6 @@
         successors().set(super.successorCount() + SUCCESSOR_END, end);
     }
 
-    private static final List<BlockBegin> NO_HANDLERS = Collections.emptyList();
-
     /**
      * A unique id used in tracing.
      */
@@ -96,6 +94,10 @@
         this.lirBlock = block;
     }
 
+    public LIRBlock lirBlock() {
+        return lirBlock;
+    }
+
     /**
      * Index of bytecode that generated this node when appended in a basic block.
      * Negative values indicate special cases.
@@ -409,30 +411,10 @@
         }
     }
 
-    /**
-     * @return the label associated with the block, used by the LIR
-     */
-    public Label label() {
-        return lirBlock().label;
-    }
-
-    public LIRList lir() {
-        return lirBlock().lir();
-    }
-
-    public LIRBlock lirBlock() {
-        return lirBlock;
-    }
-
     public Instruction predAt(int j) {
         return (Instruction) predecessors().get(j);
     }
 
-
-    public boolean isPredecessor(Instruction block) {
-        return predecessors().contains(block);
-    }
-
     public void printWithoutPhis(LogStream out) {
         // print block id
         BlockEnd end = end();
@@ -540,8 +522,6 @@
 
     }
 
-
-
     /**
      * Determines if a given instruction is a phi whose {@linkplain Phi#block() join block} is a given block.
      *
@@ -614,6 +594,4 @@
             }
         }
     }
-
-
 }