jruby · Sep 2, 2015 · Sep 2, 2015 · Sep 2, 2015
diff --git a/core/src/main/java/org/jruby/util/cli/Options.java b/core/src/main/java/org/jruby/util/cli/Options.java
@@ -228,13 +228,14 @@ public class Options {
 
     public static final Option<Integer> TRUFFLE_DEFAULT_CACHE = integer(TRUFFLE, "truffle.default_cache", 8, "Default size for caches.");
 
-    public static final Option<Integer> TRUFFLE_METHOD_LOOKUP_CACHE = integer(TRUFFLE, "truffle.method_lookup.cache", TRUFFLE_DEFAULT_CACHE.load(), "Constant lookup cache size");
+    public static final Option<Integer> TRUFFLE_METHOD_LOOKUP_CACHE = integer(TRUFFLE, "truffle.method_lookup.cache", TRUFFLE_DEFAULT_CACHE.load(), "Method lookup cache size");
     public static final Option<Integer> TRUFFLE_DISPATCH_CACHE = integer(TRUFFLE, "truffle.dispatch.cache", TRUFFLE_DEFAULT_CACHE.load(), "Dispatch (various forms of method call) cache size.");
     public static final Option<Integer> TRUFFLE_YIELD_CACHE = integer(TRUFFLE, "truffle.yield.cache", TRUFFLE_DEFAULT_CACHE.load(), "Yield cache size.");
     public static final Option<Integer> TRUFFLE_METHOD_TO_PROC_CACHE = integer(TRUFFLE, "truffle.to_proc.cache", TRUFFLE_DEFAULT_CACHE.load(), "Method#to_proc cache size");
     public static final Option<Integer> TRUFFLE_IS_A_CACHE = integer(TRUFFLE, "truffle.is_a.cache", TRUFFLE_DEFAULT_CACHE.load(), "Kernel#is_a? and #kind_of? cache size");
     public static final Option<Integer> TRUFFLE_BIND_CACHE = integer(TRUFFLE, "truffle.bind.cache", TRUFFLE_DEFAULT_CACHE.load(), "Test for being able to bind a method to a module cache size");
     public static final Option<Integer> TRUFFLE_CONSTANT_LOOKUP_CACHE = integer(TRUFFLE, "truffle.constant_lookup.cache", TRUFFLE_DEFAULT_CACHE.load(), "Constant lookup cache size");
+    public static final Option<Integer> TRUFFLE_FIELD_LOOKUP_CACHE = integer(TRUFFLE, "truffle.field_lookup.cache", TRUFFLE_DEFAULT_CACHE.load(), "Object field lookup cache size");
     public static final Option<Integer> TRUFFLE_BINDING_LOCAL_VARIABLE_CACHE = integer(TRUFFLE, "truffle.binding_local_variable.cache", TRUFFLE_DEFAULT_CACHE.load(), "Binding#local_variable_get/set cache size");
     public static final Option<Integer> TRUFFLE_SYMBOL_TO_PROC_CACHE = integer(TRUFFLE, "truffle.symbol_to_proc.cache", TRUFFLE_DEFAULT_CACHE.load(), "Symbol#to_proc cache size");
     public static final Option<Integer> TRUFFLE_ALLOCATE_CLASS_CACHE = integer(TRUFFLE, "truffle.allocate_class.cache", TRUFFLE_DEFAULT_CACHE.load(), "Allocation size class cache size");

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/cast/TaintResultNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/cast/TaintResultNode.java
@@ -51,7 +51,7 @@ public TaintResultNode(RubyContext context, SourceSection sourceSection) {
     }
 
     public Object maybeTaint(DynamicObject source, DynamicObject result) {
-        if (taintProfile.profile(isTaintedNode.isTainted(source))) {
+        if (taintProfile.profile(isTaintedNode.executeIsTainted(source))) {
             if (taintNode == null) {
                 CompilerDirectives.transferToInterpreter();
                 taintNode = insert(TaintNodeGen.create(getContext(), getSourceSection(), null));

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/ExceptionNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/ExceptionNodes.java
@@ -18,6 +18,7 @@
 import org.jruby.RubyString;
 import org.jruby.truffle.nodes.RubyGuards;
 import org.jruby.truffle.nodes.objectstorage.ReadHeadObjectFieldNode;
+import org.jruby.truffle.nodes.objectstorage.ReadHeadObjectFieldNodeGen;
 import org.jruby.truffle.runtime.NotProvided;
 import org.jruby.truffle.runtime.RubyCallStack;
 import org.jruby.truffle.runtime.RubyContext;
@@ -91,13 +92,14 @@ public abstract static class BacktraceNode extends CoreMethodArrayArgumentsNode
 
         public BacktraceNode(RubyContext context, SourceSection sourceSection) {
             super(context, sourceSection);
-            readCustomBacktrace = new ReadHeadObjectFieldNode("@custom_backtrace");
+            readCustomBacktrace = ReadHeadObjectFieldNodeGen.create(context, sourceSection, "@custom_backtrace", null, null);
         }
 
         @Specialization
         public Object backtrace(DynamicObject exception) {
-            if (readCustomBacktrace.isSet(exception)) {
-                return readCustomBacktrace.execute(exception);
+            final Object customBacktrace = readCustomBacktrace.execute(exception);
+            if (customBacktrace != null) {
+                return customBacktrace;
             } else if (Layouts.EXCEPTION.getBacktrace(exception) != null) {
                 return asRubyStringArray(exception);
             } else {

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/KernelNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/KernelNodes.java
@@ -1013,7 +1013,7 @@ public Object instanceVariableGetSymbol(DynamicObject object, DynamicObject name
         }
 
         private Object instanceVariableGet(DynamicObject object, String name) {
-            return object.get(RubyContext.checkInstanceVariableName(getContext(), name, this), Layouts.MODULE.getFields(Layouts.BASIC_OBJECT.getLogicalClass(object)).getContext().getCoreLibrary().getNilObject());
+            return object.get(RubyContext.checkInstanceVariableName(getContext(), name, this), nil());
         }
 
     }

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/ObjectSpaceNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/ObjectSpaceNodes.java
@@ -12,6 +12,7 @@
 import org.jruby.truffle.nodes.RubyGuards;
 import org.jruby.truffle.nodes.dispatch.RespondToNode;
 import org.jruby.truffle.nodes.objectstorage.ReadHeadObjectFieldNode;
+import org.jruby.truffle.nodes.objectstorage.ReadHeadObjectFieldNodeGen;
 import org.jruby.truffle.runtime.ModuleOperations;
 import org.jruby.truffle.runtime.NotProvided;
 import org.jruby.truffle.runtime.RubyContext;
@@ -29,6 +30,7 @@
 import com.oracle.truffle.api.dsl.ImportStatic;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.VirtualFrame;
+import com.oracle.truffle.api.nodes.UnexpectedResultException;
 import com.oracle.truffle.api.object.DynamicObject;
 import com.oracle.truffle.api.source.SourceSection;
 
@@ -73,8 +75,14 @@ public Object id2Ref(final VirtualFrame frame, final long id,
             new ObjectGraph(getContext()).visitObjects(new ObjectGraphVisitor() {
                 @Override
                 public boolean visit(DynamicObject object) throws StopVisitingObjectsException {
-                    final Object objectID = readObjectIdNode.execute(object);
-                    if (objectID != nil() && (long) objectID == id) {
+                    final long objectID;
+                    try {
+                        objectID = readObjectIdNode.executeLong(object);
+                    } catch (UnexpectedResultException e) {
+                        throw new UnsupportedOperationException(e);
+                    }
+
+                    if (objectID == id) {
                         result.set(object);
                         throw new StopVisitingObjectsException();
                     }
@@ -96,7 +104,7 @@ public double id2RefFloat(DynamicObject id) {
         }
 
         protected ReadHeadObjectFieldNode createReadObjectIDNode() {
-            return new ReadHeadObjectFieldNode(Layouts.OBJECT_ID_IDENTIFIER);
+            return ReadHeadObjectFieldNodeGen.create(getContext(), getSourceSection(), Layouts.OBJECT_ID_IDENTIFIER, 0L, null);
         }
 
         protected boolean isLargeFixnumID(DynamicObject id) {

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/objects/IsFrozenNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/objects/IsFrozenNode.java
@@ -10,22 +10,22 @@
 
 package org.jruby.truffle.nodes.objects;
 
-import com.oracle.truffle.api.CompilerDirectives;
+import org.jruby.truffle.nodes.RubyNode;
+import org.jruby.truffle.nodes.objectstorage.ReadHeadObjectFieldNode;
+import org.jruby.truffle.nodes.objectstorage.ReadHeadObjectFieldNodeGen;
+import org.jruby.truffle.runtime.RubyContext;
+import org.jruby.truffle.runtime.layouts.Layouts;
+
+import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.NodeChild;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.nodes.UnexpectedResultException;
 import com.oracle.truffle.api.object.DynamicObject;
 import com.oracle.truffle.api.source.SourceSection;
-import org.jruby.truffle.nodes.RubyNode;
-import org.jruby.truffle.nodes.objectstorage.ReadHeadObjectFieldNode;
-import org.jruby.truffle.runtime.RubyContext;
-import org.jruby.truffle.runtime.layouts.Layouts;
 
 @NodeChild(value = "child")
 public abstract class IsFrozenNode extends RubyNode {
 
-    @Child private ReadHeadObjectFieldNode readFrozenNode;
-
     public IsFrozenNode(RubyContext context, SourceSection sourceSection) {
         super(context, sourceSection);
     }
@@ -68,16 +68,16 @@ public boolean isFrozenSymbol(DynamicObject symbol) {
     }
 
     @Specialization(guards = { "!isNil(object)", "!isRubyBignum(object)", "!isRubySymbol(object)" })
-    public boolean isFrozen(DynamicObject object) {
-        if (readFrozenNode == null) {
-            CompilerDirectives.transferToInterpreter();
-            readFrozenNode = insert(new ReadHeadObjectFieldNode(Layouts.FROZEN_IDENTIFIER));
-        }
-
+    protected boolean isFrozen(DynamicObject object,
+            @Cached("createReadFrozenNode()") ReadHeadObjectFieldNode readFrozenNode) {
         try {
-            return readFrozenNode.isSet(object) && readFrozenNode.executeBoolean(object);
+            return readFrozenNode.executeBoolean(object);
         } catch (UnexpectedResultException e) {
-            throw new UnsupportedOperationException(readFrozenNode.execute(object).toString());
+            throw new UnsupportedOperationException(e);
         }
     }
+
+    protected ReadHeadObjectFieldNode createReadFrozenNode() {
+        return ReadHeadObjectFieldNodeGen.create(getContext(), getSourceSection(), Layouts.FROZEN_IDENTIFIER, false, null);
+    }
 }
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/objects/IsTaintedNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/objects/IsTaintedNode.java
@@ -9,16 +9,18 @@
  */
 package org.jruby.truffle.nodes.objects;
 
-import com.oracle.truffle.api.CompilerDirectives;
+import org.jruby.truffle.nodes.RubyNode;
+import org.jruby.truffle.nodes.objectstorage.ReadHeadObjectFieldNode;
+import org.jruby.truffle.nodes.objectstorage.ReadHeadObjectFieldNodeGen;
+import org.jruby.truffle.runtime.RubyContext;
+import org.jruby.truffle.runtime.layouts.Layouts;
+
+import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.NodeChild;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.nodes.UnexpectedResultException;
 import com.oracle.truffle.api.object.DynamicObject;
 import com.oracle.truffle.api.source.SourceSection;
-import org.jruby.truffle.nodes.RubyNode;
-import org.jruby.truffle.nodes.objectstorage.ReadHeadObjectFieldNode;
-import org.jruby.truffle.runtime.RubyContext;
-import org.jruby.truffle.runtime.layouts.Layouts;
 
 @NodeChild(value = "child", type = RubyNode.class)
 public abstract class IsTaintedNode extends RubyNode {
@@ -52,17 +54,17 @@ public boolean isTainted(double object) {
     }
 
     @Specialization
-    public boolean isTainted(DynamicObject object) {
-        if (readTaintNode == null) {
-            CompilerDirectives.transferToInterpreter();
-            readTaintNode = insert(new ReadHeadObjectFieldNode(Layouts.TAINTED_IDENTIFIER));
-        }
-
+    protected boolean isTainted(DynamicObject object,
+            @Cached("createReadTaintedNode()") ReadHeadObjectFieldNode readTaintedNode) {
         try {
-            return readTaintNode.isSet(object) && readTaintNode.executeBoolean(object);
+            return readTaintedNode.executeBoolean(object);
         } catch (UnexpectedResultException e) {
-            throw new UnsupportedOperationException(readTaintNode.execute(object).toString());
+            throw new UnsupportedOperationException(e);
         }
     }
 
+    protected ReadHeadObjectFieldNode createReadTaintedNode() {
+        return ReadHeadObjectFieldNodeGen.create(getContext(), getSourceSection(), Layouts.TAINTED_IDENTIFIER, false, null);
+    }
+
 }
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/objects/ReadInstanceVariableNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/objects/ReadInstanceVariableNode.java
@@ -17,10 +17,12 @@
 import com.oracle.truffle.api.object.Shape;
 import com.oracle.truffle.api.source.SourceSection;
 import com.oracle.truffle.api.utilities.BranchProfile;
+
 import org.jcodings.specific.UTF8Encoding;
 import org.jruby.RubyString;
 import org.jruby.truffle.nodes.RubyNode;
 import org.jruby.truffle.nodes.objectstorage.ReadHeadObjectFieldNode;
+import org.jruby.truffle.nodes.objectstorage.ReadHeadObjectFieldNodeGen;
 import org.jruby.truffle.runtime.RubyContext;
 import org.jruby.truffle.runtime.layouts.Layouts;
 import org.jruby.truffle.translator.ReadNode;
@@ -37,7 +39,7 @@ public class ReadInstanceVariableNode extends RubyNode implements ReadNode {
     public ReadInstanceVariableNode(RubyContext context, SourceSection sourceSection, String name, RubyNode receiver, boolean isGlobal) {
         super(context, sourceSection);
         this.receiver = receiver;
-        readNode = new ReadHeadObjectFieldNode(name);
+        readNode = ReadHeadObjectFieldNodeGen.create(context, sourceSection, name, nil(), null);
         this.isGlobal = isGlobal;
     }
 
@@ -102,14 +104,8 @@ public Object isDefined(VirtualFrame frame) {
         if (isGlobal) {
             final DynamicObject receiverValue = (DynamicObject) receiver.execute(frame);
 
-            if (readNode.getName().equals("$~") || readNode.getName().equals("$!")) {
+            if (readNode.getName().equals("$~") || readNode.getName().equals("$!") || readNode.execute(receiverValue) != nil()) {
                 return Layouts.STRING.createString(getContext().getCoreLibrary().getStringFactory(), RubyString.encodeBytelist("global-variable", UTF8Encoding.INSTANCE), StringSupport.CR_7BIT, null);
-            } else if (readNode.isSet(receiverValue)) {
-                if (readNode.execute(receiverValue) == nil()) {
-                    return nil();
-                } else {
-                    return Layouts.STRING.createString(getContext().getCoreLibrary().getStringFactory(), RubyString.encodeBytelist("global-variable", UTF8Encoding.INSTANCE), StringSupport.CR_7BIT, null);
-                }
             } else {
                 return nil();
             }

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/objectstorage/ReadBooleanObjectFieldNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/objectstorage/ReadBooleanObjectFieldNode.java
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/objectstorage/ReadDoubleObjectFieldNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/objectstorage/ReadDoubleObjectFieldNode.java