--- a/graal/GraalCompiler/src/com/sun/c1x/value/FrameStateBuilder.java	Tue May 31 16:54:15 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/value/FrameStateBuilder.java	Wed Jun 01 16:26:17 2011 +0200
@@ -28,7 +28,6 @@
 import java.util.*;
 
 import com.oracle.graal.graph.*;
-import com.sun.c1x.graph.*;
 import com.sun.c1x.ir.*;
 import com.sun.cri.ci.*;
 import com.sun.cri.ri.*;
@@ -44,7 +43,10 @@
 
     private int stackIndex;
 
+    private final RiMethod method;
+
     public FrameStateBuilder(RiMethod method, Graph graph) {
+        this.method = method;
         this.graph = graph;
         this.locals = new Value[method.maxLocals()];
         this.stack = new Value[method.maxStackSize()];
@@ -97,12 +99,12 @@
     }
 
     public FrameState create(int bci) {
-        return new FrameState(bci, locals, stack, stackIndex, locks, graph);
+        return new FrameState(method, bci, locals, stack, stackIndex, locks, graph);
     }
 
     @Override
     public FrameState duplicateWithEmptyStack(int bci) {
-        FrameState frameState = new FrameState(bci, locals, new Value[0], 0, locks, graph);
+        FrameState frameState = new FrameState(method, bci, locals, new Value[0], 0, locks, graph);
         frameState.setOuterFrameState(outerFrameState());
         return frameState;
     }
@@ -361,7 +363,7 @@
      * @param scope the IRScope in which this locking operation occurs
      * @param obj the object being locked
      */
-    public void lock(IR ir, Value obj, int totalNumberOfLocks) {
+    public void lock(Value obj) {
         locks.add(obj);
     }
 
@@ -498,7 +500,7 @@
     }
 
     @Override
-    public Value outerFrameState() {
+    public FrameState outerFrameState() {
         return null;
     }
 }