Mercurial > hg > truffle
changeset 18867:7f4cb7587f4c
localized replay compilation marker interface to HotSpot specific code
line wrap: on
line diff
--- a/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/Remote.java Wed Jan 14 16:40:14 2015 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,30 +0,0 @@ -/* - * Copyright (c) 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.api.meta; - -/** - * Marker interface for classes whose values are proxied during replay compilation capture or remote - * compilation. - */ -public interface Remote { -}
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotForeignCallLinkageImpl.java Wed Jan 14 16:40:14 2015 +0100 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotForeignCallLinkageImpl.java Wed Jan 14 16:40:56 2015 +0100 @@ -38,7 +38,7 @@ /** * The details required to link a HotSpot runtime or stub call. */ -public class HotSpotForeignCallLinkageImpl implements HotSpotForeignCallLinkage, Remote { +public class HotSpotForeignCallLinkageImpl implements HotSpotForeignCallLinkage, HotSpotProxified { /** * The descriptor of the call.
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotGraalRuntime.java Wed Jan 14 16:40:14 2015 +0100 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotGraalRuntime.java Wed Jan 14 16:40:56 2015 +0100 @@ -61,7 +61,7 @@ /** * Singleton class holding the instance of the {@link GraalRuntime}. */ -public final class HotSpotGraalRuntime implements HotSpotGraalRuntimeProvider, Remote { +public final class HotSpotGraalRuntime implements HotSpotGraalRuntimeProvider, HotSpotProxified { private static final HotSpotGraalRuntime instance;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotProxified.java Wed Jan 14 16:40:56 2015 +0100 @@ -0,0 +1,29 @@ +/* + * Copyright (c) 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.hotspot; + +/** + * Marker interface for classes whose values are proxied during replay compilation capture. + */ +public interface HotSpotProxified { +}
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotConstantPool.java Wed Jan 14 16:40:14 2015 +0100 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotConstantPool.java Wed Jan 14 16:40:56 2015 +0100 @@ -35,7 +35,7 @@ /** * Implementation of {@link ConstantPool} for HotSpot. */ -public class HotSpotConstantPool extends CompilerObject implements ConstantPool, Remote { +public class HotSpotConstantPool extends CompilerObject implements ConstantPool, HotSpotProxified { private static final long serialVersionUID = -5443206401485234850L;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotConstantReflectionProvider.java Wed Jan 14 16:40:14 2015 +0100 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotConstantReflectionProvider.java Wed Jan 14 16:40:56 2015 +0100 @@ -41,7 +41,7 @@ /** * HotSpot implementation of {@link ConstantReflectionProvider}. */ -public class HotSpotConstantReflectionProvider implements ConstantReflectionProvider, Remote { +public class HotSpotConstantReflectionProvider implements ConstantReflectionProvider, HotSpotProxified { 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 Jan 14 16:40:14 2015 +0100 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotMemoryAccessProviderImpl.java Wed Jan 14 16:40:56 2015 +0100 @@ -33,7 +33,7 @@ /** * HotSpot implementation of {@link MemoryAccessProvider}. */ -public class HotSpotMemoryAccessProviderImpl implements HotSpotMemoryAccessProvider, Remote { +public class HotSpotMemoryAccessProviderImpl implements HotSpotMemoryAccessProvider, HotSpotProxified { protected final HotSpotGraalRuntimeProvider runtime;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotMetaAccessProvider.java Wed Jan 14 16:40:14 2015 +0100 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotMetaAccessProvider.java Wed Jan 14 16:40:56 2015 +0100 @@ -38,7 +38,7 @@ /** * HotSpot implementation of {@link MetaAccessProvider}. */ -public class HotSpotMetaAccessProvider implements MetaAccessProvider, Remote { +public class HotSpotMetaAccessProvider implements MetaAccessProvider, HotSpotProxified { protected final HotSpotGraalRuntimeProvider runtime;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotMetaspaceConstantImpl.java Wed Jan 14 16:40:14 2015 +0100 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotMetaspaceConstantImpl.java Wed Jan 14 16:40:56 2015 +0100 @@ -25,9 +25,10 @@ import java.util.*; import com.oracle.graal.api.meta.*; +import com.oracle.graal.hotspot.*; import com.oracle.graal.hotspot.HotSpotVMConfig.CompressEncoding; -public final class HotSpotMetaspaceConstantImpl extends PrimitiveConstant implements HotSpotMetaspaceConstant, VMConstant, Remote { +public final class HotSpotMetaspaceConstantImpl extends PrimitiveConstant implements HotSpotMetaspaceConstant, VMConstant, HotSpotProxified { private static final long serialVersionUID = 1003463314013122983L;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotMethodHandleAccessProvider.java Wed Jan 14 16:40:14 2015 +0100 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotMethodHandleAccessProvider.java Wed Jan 14 16:40:56 2015 +0100 @@ -30,7 +30,7 @@ import com.oracle.graal.compiler.common.*; import com.oracle.graal.hotspot.*; -public class HotSpotMethodHandleAccessProvider implements MethodHandleAccessProvider, Remote { +public class HotSpotMethodHandleAccessProvider implements MethodHandleAccessProvider, HotSpotProxified { private final ConstantReflectionProvider constantReflection;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotObjectConstantImpl.java Wed Jan 14 16:40:14 2015 +0100 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotObjectConstantImpl.java Wed Jan 14 16:40:56 2015 +0100 @@ -29,6 +29,7 @@ import com.oracle.graal.api.code.*; import com.oracle.graal.api.meta.*; import com.oracle.graal.graph.*; +import com.oracle.graal.hotspot.*; import com.oracle.graal.lir.*; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; @@ -37,7 +38,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, Remote { +public final class HotSpotObjectConstantImpl extends AbstractValue implements HotSpotObjectConstant, HotSpotProxified { private static final long serialVersionUID = 3592151693708093496L;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotProfilingInfo.java Wed Jan 14 16:40:14 2015 +0100 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotProfilingInfo.java Wed Jan 14 16:40:56 2015 +0100 @@ -27,7 +27,7 @@ import com.oracle.graal.hotspot.*; import com.oracle.graal.nodes.*; -public final class HotSpotProfilingInfo extends CompilerObject implements ProfilingInfo, Remote { +public final class HotSpotProfilingInfo extends CompilerObject implements ProfilingInfo, HotSpotProxified { 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 Jan 14 16:40:14 2015 +0100 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotResolvedJavaFieldImpl.java Wed Jan 14 16:40:56 2015 +0100 @@ -36,7 +36,7 @@ /** * Represents a field in a HotSpot type. */ -public class HotSpotResolvedJavaFieldImpl extends CompilerObject implements HotSpotResolvedJavaField, Remote { +public class HotSpotResolvedJavaFieldImpl extends CompilerObject implements HotSpotResolvedJavaField, HotSpotProxified { 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 Jan 14 16:40:14 2015 +0100 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotResolvedJavaMethodImpl.java Wed Jan 14 16:40:56 2015 +0100 @@ -42,7 +42,7 @@ /** * Implementation of {@link JavaMethod} for resolved HotSpot methods. */ -public final class HotSpotResolvedJavaMethodImpl extends HotSpotMethod implements HotSpotResolvedJavaMethod, Remote { +public final class HotSpotResolvedJavaMethodImpl extends HotSpotMethod implements HotSpotResolvedJavaMethod, HotSpotProxified { private static final long serialVersionUID = -5486975070147586588L;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotResolvedObjectTypeImpl.java Wed Jan 14 16:40:14 2015 +0100 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotResolvedObjectTypeImpl.java Wed Jan 14 16:40:56 2015 +0100 @@ -38,7 +38,7 @@ /** * Implementation of {@link JavaType} for resolved non-primitive HotSpot classes. */ -public final class HotSpotResolvedObjectTypeImpl extends HotSpotResolvedJavaType implements HotSpotResolvedObjectType, Remote { +public final class HotSpotResolvedObjectTypeImpl extends HotSpotResolvedJavaType implements HotSpotResolvedObjectType, HotSpotProxified { private static final long serialVersionUID = 3481514353553840471L;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotResolvedPrimitiveType.java Wed Jan 14 16:40:14 2015 +0100 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotResolvedPrimitiveType.java Wed Jan 14 16:40:56 2015 +0100 @@ -30,11 +30,12 @@ import com.oracle.graal.api.meta.*; import com.oracle.graal.compiler.common.*; +import com.oracle.graal.hotspot.*; /** * Implementation of {@link JavaType} for primitive HotSpot types. */ -public final class HotSpotResolvedPrimitiveType extends HotSpotResolvedJavaType implements Remote { +public final class HotSpotResolvedPrimitiveType extends HotSpotResolvedJavaType implements HotSpotProxified { private static final long serialVersionUID = -6208552348908071473L; private final Kind kind;