changeset 18530:2906b3cc3e2f

moved application of Remote marker interface to implementation classes only
author Doug Simon <doug.simon@oracle.com>
date Wed, 26 Nov 2014 13:20:14 +0100
parents ab86fa952750
children cdb9c605051a
files graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/ForeignCallsProvider.java graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/ConstantPool.java graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/ConstantReflectionProvider.java graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/InvokeTarget.java graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/JavaField.java graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/JavaMethod.java graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/JavaType.java graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/MemoryAccessProvider.java graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/MetaAccessProvider.java graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/MethodHandleAccessProvider.java graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/ProfilingInfo.java graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/Signature.java graal/com.oracle.graal.api.replacements/src/com/oracle/graal/api/replacements/SnippetReflectionProvider.java graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotForeignCallLinkage.java graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotForeignCallLinkageImpl.java graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotGraalRuntime.java graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotGraalRuntimeProvider.java graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotConstantPool.java graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotConstantReflectionProvider.java graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotMemoryAccessProviderImpl.java graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotMetaAccessProvider.java graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotMetaspaceConstant.java graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotMetaspaceConstantImpl.java graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotMethodHandleAccessProvider.java graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotObjectConstant.java graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotObjectConstantImpl.java graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotProfilingInfo.java graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotResolvedJavaFieldImpl.java graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotResolvedJavaMethodImpl.java graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotResolvedObjectTypeImpl.java graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotResolvedPrimitiveType.java graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/Replacements.java
diffstat 32 files changed, 32 insertions(+), 32 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/ForeignCallsProvider.java	Wed Nov 26 13:08:18 2014 +0100
+++ b/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/ForeignCallsProvider.java	Wed Nov 26 13:20:14 2014 +0100
@@ -27,7 +27,7 @@
 /**
  * Details about a set of supported {@link ForeignCallDescriptor foreign calls}.
  */
-public interface ForeignCallsProvider extends Remote {
+public interface ForeignCallsProvider {
 
     /**
      * Determines if a given foreign call is side-effect free. Deoptimization cannot return
--- a/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/ConstantPool.java	Wed Nov 26 13:08:18 2014 +0100
+++ b/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/ConstantPool.java	Wed Nov 26 13:20:14 2014 +0100
@@ -27,7 +27,7 @@
  * parsing bytecode. Provides methods to look up a constant pool entry without performing
  * resolution. They are used during compilation.
  */
-public interface ConstantPool extends Remote {
+public interface ConstantPool {
 
     /**
      * Returns the number of entries the constant pool.
--- a/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/ConstantReflectionProvider.java	Wed Nov 26 13:08:18 2014 +0100
+++ b/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/ConstantReflectionProvider.java	Wed Nov 26 13:20:14 2014 +0100
@@ -32,7 +32,7 @@
  * result is not available at this point. The caller is responsible to check for {@code null}
  * results and handle them properly, e.g., not perform an optimization.
  */
-public interface ConstantReflectionProvider extends Remote {
+public interface ConstantReflectionProvider {
 
     /**
      * Compares two constants for equality. The equality relationship is symmetric. Returns
--- a/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/InvokeTarget.java	Wed Nov 26 13:08:18 2014 +0100
+++ b/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/InvokeTarget.java	Wed Nov 26 13:20:14 2014 +0100
@@ -25,5 +25,5 @@
 /**
  * Represents the resolved target of an invocation.
  */
-public interface InvokeTarget extends Remote {
+public interface InvokeTarget {
 }
--- a/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/JavaField.java	Wed Nov 26 13:08:18 2014 +0100
+++ b/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/JavaField.java	Wed Nov 26 13:20:14 2014 +0100
@@ -28,7 +28,7 @@
  * Represents a reference to a Java field, either resolved or unresolved fields. Fields, like
  * methods and types, are resolved through {@link ConstantPool constant pools}.
  */
-public interface JavaField extends Remote {
+public interface JavaField {
 
     /**
      * Returns the name of this field.
--- a/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/JavaMethod.java	Wed Nov 26 13:08:18 2014 +0100
+++ b/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/JavaMethod.java	Wed Nov 26 13:20:14 2014 +0100
@@ -28,7 +28,7 @@
  * Represents a reference to a Java method, either resolved or unresolved. Methods, like fields and
  * types, are resolved through {@link ConstantPool constant pools}.
  */
-public interface JavaMethod extends Remote {
+public interface JavaMethod {
 
     /**
      * Returns the name of this method.
--- a/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/JavaType.java	Wed Nov 26 13:08:18 2014 +0100
+++ b/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/JavaType.java	Wed Nov 26 13:20:14 2014 +0100
@@ -28,7 +28,7 @@
  * Represents a resolved or unresolved type. Types include primitives, objects, {@code void}, and
  * arrays thereof.
  */
-public interface JavaType extends Remote {
+public interface JavaType {
 
     /**
      * Returns the name of this type in internal form. The following are examples of strings
--- a/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/MemoryAccessProvider.java	Wed Nov 26 13:08:18 2014 +0100
+++ b/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/MemoryAccessProvider.java	Wed Nov 26 13:20:14 2014 +0100
@@ -25,7 +25,7 @@
 /**
  * Provides memory access operations for the target VM.
  */
-public interface MemoryAccessProvider extends Remote {
+public interface MemoryAccessProvider {
 
     /**
      * Reads a value of this kind using a base address and a displacement. No bounds checking or
--- a/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/MetaAccessProvider.java	Wed Nov 26 13:08:18 2014 +0100
+++ b/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/MetaAccessProvider.java	Wed Nov 26 13:20:14 2014 +0100
@@ -27,7 +27,7 @@
 /**
  * Provides access to the metadata of a class typically provided in a class file.
  */
-public interface MetaAccessProvider extends Remote {
+public interface MetaAccessProvider {
 
     /**
      * Returns the resolved Java type representing a given Java class.
--- a/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/MethodHandleAccessProvider.java	Wed Nov 26 13:08:18 2014 +0100
+++ b/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/MethodHandleAccessProvider.java	Wed Nov 26 13:20:14 2014 +0100
@@ -29,7 +29,7 @@
  * implementation of this interface is usually required to access non-public classes, methods, and
  * fields of {@link MethodHandle}, i.e., data that is not standardized by the Java specification.
  */
-public interface MethodHandleAccessProvider extends Remote {
+public interface MethodHandleAccessProvider {
 
     /**
      * Identification for methods defined on the class {@link MethodHandle} that are processed by
--- a/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/ProfilingInfo.java	Wed Nov 26 13:08:18 2014 +0100
+++ b/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/ProfilingInfo.java	Wed Nov 26 13:20:14 2014 +0100
@@ -28,7 +28,7 @@
  * multiple times, it may return significantly different results for every invocation as the
  * profiling information may be changed by other Java threads at any time.
  */
-public interface ProfilingInfo extends Remote {
+public interface ProfilingInfo {
 
     /**
      * Represents the three possibilities that an exception was seen at a specific BCI.
--- a/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/Signature.java	Wed Nov 26 13:08:18 2014 +0100
+++ b/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/Signature.java	Wed Nov 26 13:20:14 2014 +0100
@@ -28,7 +28,7 @@
  * @see <a href="http://docs.oracle.com/javase/specs/jvms/se7/html/jvms-4.html#jvms-4.3.3">Method
  *      Descriptors</a>
  */
-public interface Signature extends Remote {
+public interface Signature {
 
     /**
      * Returns the number of parameters in this signature, adding 1 for a receiver if requested.
--- a/graal/com.oracle.graal.api.replacements/src/com/oracle/graal/api/replacements/SnippetReflectionProvider.java	Wed Nov 26 13:08:18 2014 +0100
+++ b/graal/com.oracle.graal.api.replacements/src/com/oracle/graal/api/replacements/SnippetReflectionProvider.java	Wed Nov 26 13:20:14 2014 +0100
@@ -31,7 +31,7 @@
  * <p>
  * This interface must not be used in Graal code that is not related to snippet processing.
  */
-public interface SnippetReflectionProvider extends Remote {
+public interface SnippetReflectionProvider {
 
     /**
      * Creates a boxed {@link Kind#Object object} constant.
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotForeignCallLinkage.java	Wed Nov 26 13:08:18 2014 +0100
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotForeignCallLinkage.java	Wed Nov 26 13:20:14 2014 +0100
@@ -30,7 +30,7 @@
 /**
  * The details required to link a HotSpot runtime or stub call.
  */
-public interface HotSpotForeignCallLinkage extends ForeignCallLinkage, InvokeTarget, Remote {
+public interface HotSpotForeignCallLinkage extends ForeignCallLinkage, InvokeTarget {
 
     /**
      * Constants for specifying whether a foreign call destroys or preserves registers. A foreign
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotForeignCallLinkageImpl.java	Wed Nov 26 13:08:18 2014 +0100
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotForeignCallLinkageImpl.java	Wed Nov 26 13:20:14 2014 +0100
@@ -38,7 +38,7 @@
 /**
  * The details required to link a HotSpot runtime or stub call.
  */
-public class HotSpotForeignCallLinkageImpl implements HotSpotForeignCallLinkage {
+public class HotSpotForeignCallLinkageImpl implements HotSpotForeignCallLinkage, Remote {
 
     /**
      * The descriptor of the call.
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotGraalRuntime.java	Wed Nov 26 13:08:18 2014 +0100
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotGraalRuntime.java	Wed Nov 26 13:20:14 2014 +0100
@@ -60,7 +60,7 @@
 /**
  * Singleton class holding the instance of the {@link GraalRuntime}.
  */
-public final class HotSpotGraalRuntime implements HotSpotGraalRuntimeProvider {
+public final class HotSpotGraalRuntime implements HotSpotGraalRuntimeProvider, Remote {
 
     private static final HotSpotGraalRuntime instance;
 
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotGraalRuntimeProvider.java	Wed Nov 26 13:08:18 2014 +0100
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotGraalRuntimeProvider.java	Wed Nov 26 13:20:14 2014 +0100
@@ -35,7 +35,7 @@
 /**
  * Configuration information for the HotSpot Graal runtime.
  */
-public interface HotSpotGraalRuntimeProvider extends GraalRuntime, RuntimeProvider, StackIntrospection, Remote {
+public interface HotSpotGraalRuntimeProvider extends GraalRuntime, RuntimeProvider, StackIntrospection {
 
     HotSpotVMConfig getConfig();
 
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotConstantPool.java	Wed Nov 26 13:08:18 2014 +0100
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotConstantPool.java	Wed Nov 26 13:20:14 2014 +0100
@@ -35,7 +35,7 @@
 /**
  * Implementation of {@link ConstantPool} for HotSpot.
  */
-public class HotSpotConstantPool extends CompilerObject implements ConstantPool {
+public class HotSpotConstantPool extends CompilerObject implements ConstantPool, Remote {
 
     private static final long serialVersionUID = -5443206401485234850L;
 
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotConstantReflectionProvider.java	Wed Nov 26 13:08:18 2014 +0100
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotConstantReflectionProvider.java	Wed Nov 26 13:20:14 2014 +0100
@@ -41,7 +41,7 @@
 /**
  * HotSpot implementation of {@link ConstantReflectionProvider}.
  */
-public class HotSpotConstantReflectionProvider implements ConstantReflectionProvider {
+public class HotSpotConstantReflectionProvider implements ConstantReflectionProvider, Remote {
     private static final String SystemClassName = "Ljava/lang/System;";
 
     protected final HotSpotGraalRuntimeProvider runtime;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotMemoryAccessProviderImpl.java	Wed Nov 26 13:08:18 2014 +0100
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotMemoryAccessProviderImpl.java	Wed Nov 26 13:20:14 2014 +0100
@@ -33,7 +33,7 @@
 /**
  * HotSpot implementation of {@link MemoryAccessProvider}.
  */
-public class HotSpotMemoryAccessProviderImpl implements HotSpotMemoryAccessProvider {
+public class HotSpotMemoryAccessProviderImpl implements HotSpotMemoryAccessProvider, Remote {
 
     protected final HotSpotGraalRuntimeProvider runtime;
 
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotMetaAccessProvider.java	Wed Nov 26 13:08:18 2014 +0100
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotMetaAccessProvider.java	Wed Nov 26 13:20:14 2014 +0100
@@ -38,7 +38,7 @@
 /**
  * HotSpot implementation of {@link MetaAccessProvider}.
  */
-public class HotSpotMetaAccessProvider implements MetaAccessProvider {
+public class HotSpotMetaAccessProvider implements MetaAccessProvider, Remote {
 
     protected final HotSpotGraalRuntimeProvider runtime;
 
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotMetaspaceConstant.java	Wed Nov 26 13:08:18 2014 +0100
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotMetaspaceConstant.java	Wed Nov 26 13:20:14 2014 +0100
@@ -25,7 +25,7 @@
 import com.oracle.graal.api.meta.*;
 import com.oracle.graal.hotspot.HotSpotVMConfig.CompressEncoding;
 
-public interface HotSpotMetaspaceConstant extends HotSpotConstant, VMConstant, Remote {
+public interface HotSpotMetaspaceConstant extends HotSpotConstant, VMConstant {
 
     boolean isCompressed();
 
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotMetaspaceConstantImpl.java	Wed Nov 26 13:08:18 2014 +0100
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotMetaspaceConstantImpl.java	Wed Nov 26 13:20:14 2014 +0100
@@ -27,7 +27,7 @@
 import com.oracle.graal.api.meta.*;
 import com.oracle.graal.hotspot.HotSpotVMConfig.CompressEncoding;
 
-public final class HotSpotMetaspaceConstantImpl extends PrimitiveConstant implements HotSpotMetaspaceConstant, VMConstant {
+public final class HotSpotMetaspaceConstantImpl extends PrimitiveConstant implements HotSpotMetaspaceConstant, VMConstant, Remote {
 
     private static final long serialVersionUID = 1003463314013122983L;
 
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotMethodHandleAccessProvider.java	Wed Nov 26 13:08:18 2014 +0100
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotMethodHandleAccessProvider.java	Wed Nov 26 13:20:14 2014 +0100
@@ -30,7 +30,7 @@
 import com.oracle.graal.compiler.common.*;
 import com.oracle.graal.hotspot.*;
 
-public class HotSpotMethodHandleAccessProvider implements MethodHandleAccessProvider {
+public class HotSpotMethodHandleAccessProvider implements MethodHandleAccessProvider, Remote {
 
     private final ConstantReflectionProvider constantReflection;
 
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotObjectConstant.java	Wed Nov 26 13:08:18 2014 +0100
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotObjectConstant.java	Wed Nov 26 13:20:14 2014 +0100
@@ -33,7 +33,7 @@
  * Represents a constant non-{@code null} object reference, within the compiler and across the
  * compiler/runtime interface.
  */
-public interface HotSpotObjectConstant extends JavaConstant, HotSpotConstant, VMConstant, Remote {
+public interface HotSpotObjectConstant extends JavaConstant, HotSpotConstant, VMConstant {
 
     JavaConstant compress();
 
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotObjectConstantImpl.java	Wed Nov 26 13:08:18 2014 +0100
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotObjectConstantImpl.java	Wed Nov 26 13:20:14 2014 +0100
@@ -35,7 +35,7 @@
  * Represents a constant non-{@code null} object reference, within the compiler and across the
  * compiler/runtime interface.
  */
-public final class HotSpotObjectConstantImpl extends AbstractValue implements HotSpotObjectConstant {
+public final class HotSpotObjectConstantImpl extends AbstractValue implements HotSpotObjectConstant, Remote {
 
     private static final long serialVersionUID = 3592151693708093496L;
 
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotProfilingInfo.java	Wed Nov 26 13:08:18 2014 +0100
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotProfilingInfo.java	Wed Nov 26 13:20:14 2014 +0100
@@ -27,7 +27,7 @@
 import com.oracle.graal.hotspot.*;
 import com.oracle.graal.nodes.*;
 
-public final class HotSpotProfilingInfo extends CompilerObject implements ProfilingInfo {
+public final class HotSpotProfilingInfo extends CompilerObject implements ProfilingInfo, Remote {
 
     private static final long serialVersionUID = -8307682725047864875L;
     private static final DebugMetric metricInsufficentSpace = Debug.metric("InsufficientSpaceForProfilingData");
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotResolvedJavaFieldImpl.java	Wed Nov 26 13:08:18 2014 +0100
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotResolvedJavaFieldImpl.java	Wed Nov 26 13:20:14 2014 +0100
@@ -36,7 +36,7 @@
 /**
  * Represents a field in a HotSpot type.
  */
-public class HotSpotResolvedJavaFieldImpl extends CompilerObject implements HotSpotResolvedJavaField {
+public class HotSpotResolvedJavaFieldImpl extends CompilerObject implements HotSpotResolvedJavaField, Remote {
 
     private static final long serialVersionUID = 7692985878836955683L;
     private final HotSpotResolvedObjectTypeImpl holder;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotResolvedJavaMethodImpl.java	Wed Nov 26 13:08:18 2014 +0100
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotResolvedJavaMethodImpl.java	Wed Nov 26 13:20:14 2014 +0100
@@ -42,7 +42,7 @@
 /**
  * Implementation of {@link JavaMethod} for resolved HotSpot methods.
  */
-public final class HotSpotResolvedJavaMethodImpl extends HotSpotMethod implements HotSpotResolvedJavaMethod {
+public final class HotSpotResolvedJavaMethodImpl extends HotSpotMethod implements HotSpotResolvedJavaMethod, Remote {
 
     private static final long serialVersionUID = -5486975070147586588L;
 
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotResolvedObjectTypeImpl.java	Wed Nov 26 13:08:18 2014 +0100
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotResolvedObjectTypeImpl.java	Wed Nov 26 13:20:14 2014 +0100
@@ -38,7 +38,7 @@
 /**
  * Implementation of {@link JavaType} for resolved non-primitive HotSpot classes.
  */
-public final class HotSpotResolvedObjectTypeImpl extends HotSpotResolvedJavaType implements HotSpotResolvedObjectType {
+public final class HotSpotResolvedObjectTypeImpl extends HotSpotResolvedJavaType implements HotSpotResolvedObjectType, Remote {
 
     private static final long serialVersionUID = 3481514353553840471L;
 
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotResolvedPrimitiveType.java	Wed Nov 26 13:08:18 2014 +0100
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotResolvedPrimitiveType.java	Wed Nov 26 13:20:14 2014 +0100
@@ -34,7 +34,7 @@
 /**
  * Implementation of {@link JavaType} for primitive HotSpot types.
  */
-public final class HotSpotResolvedPrimitiveType extends HotSpotResolvedJavaType {
+public final class HotSpotResolvedPrimitiveType extends HotSpotResolvedJavaType implements Remote {
 
     private static final long serialVersionUID = -6208552348908071473L;
     private final Kind kind;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/Replacements.java	Wed Nov 26 13:08:18 2014 +0100
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/Replacements.java	Wed Nov 26 13:20:14 2014 +0100
@@ -33,7 +33,7 @@
 /**
  * Interface for managing replacements.
  */
-public interface Replacements extends Remote {
+public interface Replacements {
 
     /**
      * Gets the snippet graph derived from a given method.