--- a/graal/com.oracle.max.cri/src/com/sun/cri/ri/RiMethod.java	Tue Jan 03 15:17:35 2012 +0100
+++ b/graal/com.oracle.max.cri/src/com/sun/cri/ri/RiMethod.java	Tue Jan 03 15:24:41 2012 +0100
@@ -46,16 +46,4 @@
      * @return the signature of the method
      */
     RiSignature signature();
-
-    /**
-     * Indicates whether a direct call to this method can be linked without
-     * any concerns of the call having to be relinked (e.g. when the
-     * compiled code for this method is relocated or invalidated).
-     * This determines whether a compiler can generate code for a direct call
-     * without having to worry about thread-safe code patching issues.
-     * <p>
-     * Note that the result will always be {@code false} for methods that don't yet
-     * have compiled code.
-     */
-    boolean canBePermanentlyLinked();
 }

--- a/graal/com.oracle.max.criutils/src/com/oracle/max/criutils/BaseUnresolvedMethod.java	Tue Jan 03 15:17:35 2012 +0100
+++ b/graal/com.oracle.max.criutils/src/com/oracle/max/criutils/BaseUnresolvedMethod.java	Tue Jan 03 15:24:41 2012 +0100
@@ -66,9 +66,4 @@
     public String toString() {
         return CiUtil.format("%H.%n(%p) [unresolved]", this);
     }
-
-    @Override
-    public boolean canBePermanentlyLinked() {
-        return false;
-    }
 }

--- a/graal/com.oracle.max.graal.hotspot/src/com/oracle/max/graal/hotspot/HotSpotMethod.java	Tue Jan 03 15:17:35 2012 +0100
+++ b/graal/com.oracle.max.graal.hotspot/src/com/oracle/max/graal/hotspot/HotSpotMethod.java	Tue Jan 03 15:24:41 2012 +0100
@@ -27,7 +27,7 @@
 public abstract class HotSpotMethod extends CompilerObject implements RiMethod {
 
     /**
-     * 
+     *
      */
     private static final long serialVersionUID = 7167491397941960839L;
     protected String name;
@@ -40,11 +40,4 @@
     public final String name() {
         return name;
     }
-
-    @Override
-    public boolean canBePermanentlyLinked() {
-        // relevant in Maxine only
-        return false;
-    }
-
 }

--- a/graal/com.oracle.max.graal.hotspot/src/com/oracle/max/graal/hotspot/VMExits.java	Tue Jan 03 15:17:35 2012 +0100
+++ b/graal/com.oracle.max.graal.hotspot/src/com/oracle/max/graal/hotspot/VMExits.java	Tue Jan 03 15:24:41 2012 +0100
@@ -33,6 +33,12 @@
 
     void compileMethod(HotSpotMethodResolved method, int entryBCI, boolean blocking) throws Throwable;
 
+    void shutdownCompiler() throws Throwable;
+
+    void startCompiler() throws Throwable;
+
+    void bootstrap() throws Throwable;
+
     RiMethod createRiMethodUnresolved(String name, String signature, RiType holder);
 
     RiSignature createRiSignature(String signature);
@@ -52,10 +58,4 @@
     CiConstant createCiConstantDouble(double value);
 
     CiConstant createCiConstantObject(Object object);
-
-    void shutdownCompiler() throws Throwable;
-
-    void startCompiler() throws Throwable;
-
-    void bootstrap() throws Throwable;
 }

--- a/graal/com.oracle.max.graal.hotspot/src/com/oracle/max/graal/hotspot/snippets/HotSpotThreadSnippets.java	Tue Jan 03 15:17:35 2012 +0100
+++ b/graal/com.oracle.max.graal.hotspot/src/com/oracle/max/graal/hotspot/snippets/HotSpotThreadSnippets.java	Tue Jan 03 15:24:41 2012 +0100
@@ -37,5 +37,4 @@
     public Thread currentThread() {
         return (Thread) CurrentThread.get(threadObjectOffset);
     }
-
 }