--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/LIR.java	Mon Nov 17 17:22:54 2014 +0100
+++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/LIR.java	Mon Nov 17 16:53:26 2014 +0100
@@ -33,6 +33,7 @@
 import com.oracle.graal.debug.Debug.Scope;
 import com.oracle.graal.lir.StandardOp.BlockEndOp;
 import com.oracle.graal.lir.StandardOp.LabelOp;
+import com.oracle.graal.lir.framemap.*;
 import com.oracle.graal.lir.framemap.FrameMapBuilder.*;
 
 /**

--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/framemap/FrameMapBuilder.java	Mon Nov 17 17:22:54 2014 +0100
+++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/framemap/FrameMapBuilder.java	Mon Nov 17 16:53:26 2014 +0100
@@ -43,14 +43,6 @@
     }
 
     /**
-     * This interface should be implemented by all classes that store virtual stack slots to convert
-     * them into real stack slots when {@link FrameMapBuilder#buildFrameMap} is called.
-     */
-    interface FrameMappable {
-        void map(FrameMappingTool tool);
-    }
-
-    /**
      * Reserves a spill slot in the frame of the method being compiled. The returned slot is aligned
      * on its natural alignment, i.e., an 8-byte spill slot is aligned at an 8-byte boundary, unless
      * overridden by a subclass.

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/framemap/FrameMappable.java	Mon Nov 17 16:53:26 2014 +0100
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2014, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package com.oracle.graal.lir.framemap;
+
+import com.oracle.graal.lir.framemap.FrameMapBuilder.*;
+
+/**
+ * This interface should be implemented by all classes that store virtual stack slots to convert
+ * them into real stack slots when {@link FrameMapBuilder#buildFrameMap} is called. Implementors
+ * should register themselves using {@link FrameMapBuilder#requireMapping(FrameMappable)}.
+ */
+public interface FrameMappable {
+    void map(FrameMappingTool tool);
+}
\ No newline at end of file