Mercurial > hg > truffle
changeset 22180:5e5b38579bda
remove FieldOffsetProvider
author | Andreas Woess <andreas.woess@oracle.com> |
---|---|
date | Tue, 22 Sep 2015 14:56:59 +0200 |
parents | ee9ae440f1eb |
children | 4eb6f179a326 |
files | truffle/com.oracle.truffle.api.object/src/com/oracle/truffle/api/object/Layout.java truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/nodes/NodeUtil.java |
diffstat | 2 files changed, 11 insertions(+), 36 deletions(-) [+] |
line wrap: on
line diff
--- a/truffle/com.oracle.truffle.api.object/src/com/oracle/truffle/api/object/Layout.java Tue Sep 22 14:02:13 2015 +0200 +++ b/truffle/com.oracle.truffle.api.object/src/com/oracle/truffle/api/object/Layout.java Tue Sep 22 14:56:59 2015 +0200 @@ -24,11 +24,11 @@ */ package com.oracle.truffle.api.object; -import com.oracle.truffle.api.nodes.NodeUtil.FieldOffsetProvider; -import com.oracle.truffle.api.object.Shape.Allocator; import java.util.EnumSet; import java.util.ServiceLoader; +import com.oracle.truffle.api.object.Shape.Allocator; + /** * Describes layout and behavior of a {@link DynamicObject} subclass and is used to create shapes. * @@ -134,14 +134,12 @@ */ public static final class Builder { private EnumSet<ImplicitCast> allowedImplicitCasts; - private FieldOffsetProvider fieldOffsetProvider; /** * Create a new layout builder. */ private Builder() { this.allowedImplicitCasts = Layout.NONE; - this.fieldOffsetProvider = null; } /** @@ -161,20 +159,8 @@ return this; } - /** - * Set a custom field offset provider for this layout. - */ - public Builder setFieldOffsetProvider(FieldOffsetProvider fieldOffsetProvider) { - this.fieldOffsetProvider = fieldOffsetProvider; - return this; - } - public EnumSet<ImplicitCast> getAllowedImplicitCasts() { return allowedImplicitCasts; } - - public FieldOffsetProvider getFieldOffsetProvider() { - return fieldOffsetProvider; - } } }
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/nodes/NodeUtil.java Tue Sep 22 14:02:13 2015 +0200 +++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/nodes/NodeUtil.java Tue Sep 22 14:56:59 2015 +0200 @@ -24,14 +24,6 @@ */ package com.oracle.truffle.api.nodes; -import com.oracle.truffle.api.CompilerAsserts; -import com.oracle.truffle.api.TruffleOptions; -import com.oracle.truffle.api.instrument.Probe; -import com.oracle.truffle.api.instrument.ProbeNode.WrapperNode; -import com.oracle.truffle.api.instrument.StandardSyntaxTag; -import com.oracle.truffle.api.instrument.SyntaxTag; -import com.oracle.truffle.api.nodes.NodeFieldAccessor.NodeFieldKind; -import com.oracle.truffle.api.source.SourceSection; import java.io.OutputStream; import java.io.PrintStream; import java.io.PrintWriter; @@ -46,24 +38,21 @@ import java.util.List; import java.util.NoSuchElementException; import java.util.Objects; -import sun.misc.Unsafe; + +import com.oracle.truffle.api.CompilerAsserts; +import com.oracle.truffle.api.TruffleOptions; +import com.oracle.truffle.api.instrument.Probe; +import com.oracle.truffle.api.instrument.ProbeNode.WrapperNode; +import com.oracle.truffle.api.instrument.StandardSyntaxTag; +import com.oracle.truffle.api.instrument.SyntaxTag; +import com.oracle.truffle.api.nodes.NodeFieldAccessor.NodeFieldKind; +import com.oracle.truffle.api.source.SourceSection; /** * Utility class that manages the special access methods for node instances. */ public final class NodeUtil { - /** - * Interface that allows the customization of field offsets used for {@link Unsafe} field - * accesses. - */ - public interface FieldOffsetProvider { - - long objectFieldOffset(Field field); - - int getTypeSize(Class<?> clazz); - } - static Iterator<Node> makeIterator(Node node) { return node.getNodeClass().makeIterator(node); }