Mercurial > hg > truffle
changeset 20103:7815c4d4a07f
removed/replaced references to non replay-serializable objects from replay-serializable objects
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Tue, 31 Mar 2015 15:15:33 +0200 |
parents | 6e5df2d60fbd |
children | 2c65cac3d940 |
files | graal/com.oracle.graal.graphbuilderconf/src/com/oracle/graal/graphbuilderconf/InvocationPlugins.java graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotResolvedJavaFieldImpl.java |
diffstat | 2 files changed, 2 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.graphbuilderconf/src/com/oracle/graal/graphbuilderconf/InvocationPlugins.java Tue Mar 31 14:35:17 2015 +0200 +++ b/graal/com.oracle.graal.graphbuilderconf/src/com/oracle/graal/graphbuilderconf/InvocationPlugins.java Tue Mar 31 15:15:33 2015 +0200 @@ -213,7 +213,6 @@ protected final MetaAccessProvider metaAccess; private final List<MethodInfo> registrations; - private final Thread registrationThread; /** * The minimum {@linkplain InvocationPluginIdHolder#getInvocationPluginId() id} for a method @@ -234,7 +233,6 @@ private InvocationPlugins parent; private InvocationPlugins(InvocationPlugins parent, MetaAccessProvider metaAccess) { - this.registrationThread = Thread.currentThread(); this.metaAccess = metaAccess; this.registrations = new ArrayList<>(INITIAL_PLUGIN_CAPACITY); InvocationPlugins p = parent; @@ -263,7 +261,6 @@ * registered for {@code method}. */ public void register(InvocationPlugin plugin, Class<?> declaringClass, String name, Class<?>... argumentTypes) { - assert Thread.currentThread() == registrationThread : "invocation plugin registration must be single threaded"; MethodInfo methodInfo = new MethodInfo(plugin, declaringClass, name, argumentTypes); assert Checker.check(this, methodInfo, plugin); assert plugins == null : "invocation plugin registration is closed";
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotResolvedJavaFieldImpl.java Tue Mar 31 14:35:17 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotResolvedJavaFieldImpl.java Tue Mar 31 15:15:33 2015 +0200 @@ -51,7 +51,7 @@ private final LocationIdentity locationIdentity = new FieldLocationIdentity(this); public static class FieldLocationIdentity extends LocationIdentity { - HotSpotResolvedJavaFieldImpl inner; + HotSpotResolvedJavaField inner; public FieldLocationIdentity(HotSpotResolvedJavaFieldImpl inner) { super(false); @@ -78,7 +78,7 @@ @Override public String toString() { - return inner.name; + return inner.getName(); } }