# HG changeset patch
# User Thomas Wuerthinger <thomas@wuerthinger.net>
# Date 1305727795 -7200
# Node ID 2186ca5c2dabd5cbce6acec4545012b2704dca51
# Parent  d06cff53b77e2ef20ab93e239bc2f4ca86187b16# Parent  a51ef0310dadf5f4dc5b9bc0f6d4a09a680d9ce1
Merge.

diff -r a51ef0310dad -r 2186ca5c2dab graal/GraalCompiler/src/com/sun/c1x/graph/GraphBuilder.java
--- a/graal/GraalCompiler/src/com/sun/c1x/graph/GraphBuilder.java	Wed May 18 15:17:17 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/graph/GraphBuilder.java	Wed May 18 16:09:55 2011 +0200
@@ -206,7 +206,6 @@
             syncHandler = new BlockBegin(Instruction.SYNCHRONIZATION_ENTRY_BCI, ir.nextBlockNumber(), graph);
             syncHandler.setExceptionEntry();
             syncHandler.setBlockFlag(BlockBegin.BlockFlag.IsOnWorkList);
-            syncHandler.setBlockFlag(BlockBegin.BlockFlag.DefaultExceptionHandler);
 
             ExceptionHandler h = new ExceptionHandler(new CiExceptionHandler(0, rootMethod.code().length, -1, 0, null));
             h.setEntryBlock(syncHandler);
diff -r a51ef0310dad -r 2186ca5c2dab graal/GraalCompiler/src/com/sun/c1x/ir/BlockBegin.java
--- a/graal/GraalCompiler/src/com/sun/c1x/ir/BlockBegin.java	Wed May 18 15:17:17 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/ir/BlockBegin.java	Wed May 18 16:09:55 2011 +0200
@@ -97,7 +97,6 @@
         BackwardBranchTarget,
         IsOnWorkList,
         WasVisited,
-        DefaultExceptionHandler,
         ParserLoopHeader,
         CriticalEdgeSplit,
         LinearScanLoopHeader,
@@ -123,15 +122,13 @@
 
     private int depthFirstNumber;
     private int linearScanNumber;
-    private int loopDepth;
-    private int loopIndex;
 
     private BlockBegin dominator;
     private List<BlockBegin> exceptionHandlerBlocks;
     private List<FrameState> exceptionHandlerStates;
 
     // LIR block
-    public LIRBlock lirBlock;
+    public final LIRBlock lirBlock = new LIRBlock();
 
     /**
      * Constructs a new BlockBegin at the specified bytecode index.
@@ -145,7 +142,6 @@
         depthFirstNumber = -1;
         linearScanNumber = -1;
         predecessors = new ArrayList<BlockEnd>(2);
-        loopIndex = -1;
         setBCI(bci);
     }
 
@@ -187,7 +183,7 @@
      * @return the loop depth
      */
     public int loopDepth() {
-        return loopDepth;
+        return lirBlock.loopDepth;
     }
 
     /**
@@ -195,7 +191,7 @@
      * @return the loop index
      */
     public int loopIndex() {
-        return loopIndex;
+        return lirBlock.loopIndex;
     }
 
     /**
@@ -221,11 +217,11 @@
     }
 
     public void setLoopDepth(int loopDepth) {
-        this.loopDepth = loopDepth;
+        this.lirBlock.loopDepth = loopDepth;
     }
 
     public void setLoopIndex(int loopIndex) {
-        this.loopIndex = loopIndex;
+        this.lirBlock.loopIndex = loopIndex;
     }
 
     /**
@@ -621,9 +617,6 @@
     }
 
     public LIRBlock lirBlock() {
-        if (lirBlock == null) {
-            lirBlock = new LIRBlock();
-        }
         return lirBlock;
     }
 
diff -r a51ef0310dad -r 2186ca5c2dab graal/GraalCompiler/src/com/sun/c1x/ir/Value.java
--- a/graal/GraalCompiler/src/com/sun/c1x/ir/Value.java	Wed May 18 15:17:17 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/ir/Value.java	Wed May 18 16:09:55 2011 +0200
@@ -24,7 +24,6 @@
 
 import com.oracle.graal.graph.*;
 import com.sun.c1x.debug.*;
-import com.sun.c1x.opt.*;
 import com.sun.cri.ci.*;
 import com.sun.cri.ri.*;
 
diff -r a51ef0310dad -r 2186ca5c2dab graal/GraalCompiler/src/com/sun/c1x/lir/LIRBlock.java
--- a/graal/GraalCompiler/src/com/sun/c1x/lir/LIRBlock.java	Wed May 18 15:17:17 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/lir/LIRBlock.java	Wed May 18 16:09:55 2011 +0200
@@ -28,12 +28,11 @@
 
 /**
  * The {@code LIRBlock} class definition.
- *
- * @author Ben L. Titzer
  */
 public final class LIRBlock {
 
     public LIRBlock() {
+        loopIndex = -1;
     }
 
     public final Label label = new Label();
@@ -72,6 +71,10 @@
     public int lastLirInstructionID;
     public int exceptionHandlerPCO;
 
+
+    public int loopDepth;
+    public int loopIndex;
+
     public LIRList lir() {
         return lir;
     }
diff -r a51ef0310dad -r 2186ca5c2dab graal/GraalCompiler/src/com/sun/c1x/lir/LIRList.java
--- a/graal/GraalCompiler/src/com/sun/c1x/lir/LIRList.java	Wed May 18 15:17:17 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/lir/LIRList.java	Wed May 18 16:09:55 2011 +0200
@@ -31,7 +31,6 @@
 import com.sun.c1x.gen.*;
 import com.sun.c1x.globalstub.*;
 import com.sun.c1x.ir.*;
-import com.sun.c1x.lir.FrameMap.StackBlock;
 import com.sun.cri.ci.*;
 import com.sun.cri.ci.CiTargetMethod.Mark;
 import com.sun.cri.ri.*;
diff -r a51ef0310dad -r 2186ca5c2dab graal/GraalCompiler/src/com/sun/c1x/target/amd64/AMD64XirAssembler.java
--- a/graal/GraalCompiler/src/com/sun/c1x/target/amd64/AMD64XirAssembler.java	Wed May 18 15:17:17 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/target/amd64/AMD64XirAssembler.java	Wed May 18 16:09:55 2011 +0200
@@ -27,7 +27,6 @@
 import java.util.*;
 
 import com.oracle.max.asm.target.amd64.*;
-import com.sun.c1x.util.*;
 import com.sun.cri.ci.*;
 import com.sun.cri.xir.*;