--- a/graal/GraalCompiler/src/com/sun/c1x/asm/AbstractAssembler.java	Mon May 02 10:36:10 2011 -0700
+++ b/graal/GraalCompiler/src/com/sun/c1x/asm/AbstractAssembler.java	Tue May 03 10:19:11 2011 +0200
@@ -73,7 +73,7 @@
                 for (ExceptionHandler handler : ei.exceptionHandlers) {
                     int entryOffset = handler.entryCodeOffset();
                     RiType caughtType = handler.handler.catchType();
-                    targetMethod.recordExceptionHandler(codeOffset, ei.bci, handler.scopeCount(), entryOffset, handler.handlerBCI(), caughtType);
+                    targetMethod.recordExceptionHandler(codeOffset, ei.bci, 0, entryOffset, handler.handlerBCI(), caughtType);
                 }
             }
         }

--- a/graal/GraalCompiler/src/com/sun/c1x/graph/GraphBuilder.java	Mon May 02 10:36:10 2011 -0700
+++ b/graal/GraalCompiler/src/com/sun/c1x/graph/GraphBuilder.java	Tue May 03 10:19:11 2011 +0200
@@ -214,7 +214,7 @@
 
         if (syncHandler != null && syncHandler.stateBefore() != null) {
             // generate unlocking code if the exception handler is reachable
-            fillSyncHandler(rootMethodSynchronizedObject, syncHandler, false);
+            fillSyncHandler(rootMethodSynchronizedObject, syncHandler);
         }
     }
 
@@ -332,7 +332,6 @@
 
         ArrayList<ExceptionHandler> exceptionHandlers = new ArrayList<ExceptionHandler>();
         FrameState stateBefore = x.stateBefore();
-        int scopeCount = 0;
 
         assert stateBefore != null : "exception handler state must be available for " + x;
         FrameState state = stateBefore;
@@ -343,7 +342,7 @@
             for (ExceptionHandler handler : this.exceptionHandlers) {
                 if (handler.covers(bci)) {
                     // if the handler covers this bytecode index, add it to the list
-                    if (addExceptionHandler(exceptionHandlers, handler, state, scopeCount)) {
+                    if (addExceptionHandler(exceptionHandlers, handler, state)) {
                         // if the handler was a default handler, we are done
                         return exceptionHandlers;
                     }
@@ -365,7 +364,7 @@
      * @param scopeCount
      * @return {@code true} if handler catches all exceptions (i.e. {@code handler.isCatchAll() == true})
      */
-    private boolean addExceptionHandler(ArrayList<ExceptionHandler> exceptionHandlers, ExceptionHandler handler, FrameState curState, int scopeCount) {
+    private boolean addExceptionHandler(ArrayList<ExceptionHandler> exceptionHandlers, ExceptionHandler handler, FrameState curState) {
         compilation.setHasExceptionHandlers();
 
         BlockBegin entry = handler.entryBlock();
@@ -393,7 +392,6 @@
         // clone exception handler
         ExceptionHandler newHandler = new ExceptionHandler(handler);
         newHandler.setPhiOperand(phiOperand);
-        newHandler.setScopeCount(scopeCount);
         exceptionHandlers.add(newHandler);
 
         // fill in exception handler subgraph lazily
@@ -1244,7 +1242,7 @@
         }
     }
 
-    private void fillSyncHandler(Value lock, BlockBegin syncHandler, boolean inlinedMethod) {
+    private void fillSyncHandler(Value lock, BlockBegin syncHandler) {
         BlockBegin origBlock = curBlock;
         MutableFrameState origState = curState;
         Instruction origLast = lastInstr;

--- a/graal/GraalCompiler/src/com/sun/c1x/ir/ExceptionHandler.java	Mon May 02 10:36:10 2011 -0700
+++ b/graal/GraalCompiler/src/com/sun/c1x/ir/ExceptionHandler.java	Tue May 03 10:19:11 2011 +0200
@@ -47,14 +47,12 @@
     private LIRList entryCode;
     private int entryCodeOffset;
     private int phiOperand;
-    private int scopeCount;
     private int lirOpId;
 
     public ExceptionHandler(RiExceptionHandler handler) {
         this.handler = handler;
         this.entryCodeOffset = -1;
         this.phiOperand = -1;
-        this.scopeCount = -1;
         this.lirOpId = -1;
     }
 
@@ -64,7 +62,6 @@
         this.entryCode = other.entryCode;
         this.entryCodeOffset = other.entryCodeOffset;
         this.phiOperand = other.phiOperand;
-        this.scopeCount = other.scopeCount;
         this.lirOpId = other.lirOpId;
     }
 
@@ -120,10 +117,6 @@
         return phiOperand;
     }
 
-    public int scopeCount() {
-        return scopeCount;
-    }
-
     public void setEntryBlock(BlockBegin entry) {
         entryBlock = entry;
     }
@@ -136,10 +129,6 @@
         phiOperand = phi;
     }
 
-    public void setScopeCount(int count) {
-        scopeCount = count;
-    }
-
     public boolean isCatchAll() {
         return handler.catchTypeCPI() == 0;
     }

--- a/graal/GraalCompiler/src/com/sun/c1x/value/FrameState.java	Mon May 02 10:36:10 2011 -0700
+++ b/graal/GraalCompiler/src/com/sun/c1x/value/FrameState.java	Tue May 03 10:19:11 2011 +0200
@@ -528,7 +528,7 @@
     }
 
     /**
-     * Traverses all {@linkplain Value#isLive() live values} of this frame state and it's callers.
+     * Traverses all {@linkplain Value#isLive() live values} of this frame state.
      *
      * @param proc the call back called to process each live value traversed
      */