jruby · Oct 1, 2015 · Oct 1, 2015
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
@@ -91,7 +91,7 @@ public abstract static class BacktraceNode extends CoreMethodArrayArgumentsNode
 
         public BacktraceNode(RubyContext context, SourceSection sourceSection) {
             super(context, sourceSection);
-            readCustomBacktrace = ReadHeadObjectFieldNodeGen.create(context, sourceSection, "@custom_backtrace", null, null);
+            readCustomBacktrace = ReadHeadObjectFieldNodeGen.create("@custom_backtrace", null);
         }
 
         @Specialization

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
@@ -94,7 +94,7 @@ public double id2RefFloat(DynamicObject id) {
         }
 
         protected ReadHeadObjectFieldNode createReadObjectIDNode() {
-            return ReadHeadObjectFieldNodeGen.create(getContext(), getSourceSection(), Layouts.OBJECT_ID_IDENTIFIER, 0L, null);
+            return ReadHeadObjectFieldNodeGen.create(Layouts.OBJECT_ID_IDENTIFIER, 0L);
         }
 
         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
@@ -77,6 +77,6 @@ protected boolean isFrozen(DynamicObject object,
     }
 
     protected ReadHeadObjectFieldNode createReadFrozenNode() {
-        return ReadHeadObjectFieldNodeGen.create(getContext(), getSourceSection(), Layouts.FROZEN_IDENTIFIER, false, null);
+        return ReadHeadObjectFieldNodeGen.create(Layouts.FROZEN_IDENTIFIER, false);
     }
 }
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
@@ -63,7 +63,7 @@ protected boolean isTainted(DynamicObject object,
     }
 
     protected ReadHeadObjectFieldNode createReadTaintedNode() {
-        return ReadHeadObjectFieldNodeGen.create(getContext(), getSourceSection(), Layouts.TAINTED_IDENTIFIER, false, null);
+        return ReadHeadObjectFieldNodeGen.create(Layouts.TAINTED_IDENTIFIER, false);
     }
 
 }
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
@@ -38,7 +38,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 = ReadHeadObjectFieldNodeGen.create(context, sourceSection, name, nil(), null);
+        readNode = ReadHeadObjectFieldNodeGen.create(name, nil());
         this.isGlobal = isGlobal;
     }
 

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/objectstorage/ReadHeadObjectFieldNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/objectstorage/ReadHeadObjectFieldNode.java
@@ -11,23 +11,18 @@
 
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 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.Node;
 import com.oracle.truffle.api.nodes.UnexpectedResultException;
 import com.oracle.truffle.api.object.*;
-import com.oracle.truffle.api.source.SourceSection;
 
-import org.jruby.truffle.nodes.RubyNode;
 import org.jruby.truffle.runtime.Options;
-import org.jruby.truffle.runtime.RubyContext;
 
-@NodeChild("receiver")
-public abstract class ReadHeadObjectFieldNode extends RubyNode {
+public abstract class ReadHeadObjectFieldNode extends Node {
     private final Object defaultValue;
     protected final Object name;
 
-    public ReadHeadObjectFieldNode(RubyContext context, SourceSection sourceSection, Object name, Object defaultValue) {
-        super(context, sourceSection);
+    public ReadHeadObjectFieldNode(Object name, Object defaultValue) {
         this.name = name;
         this.defaultValue = defaultValue;
     }

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/rubinius/ObjectPrimitiveNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/rubinius/ObjectPrimitiveNodes.java
@@ -104,7 +104,7 @@ public long objectID(DynamicObject object,
         }
 
         protected ReadHeadObjectFieldNode createReadObjectIDNode() {
-            return ReadHeadObjectFieldNodeGen.create(getContext(), getSourceSection(), Layouts.OBJECT_ID_IDENTIFIER, 0L, null);
+            return ReadHeadObjectFieldNodeGen.create(Layouts.OBJECT_ID_IDENTIFIER, 0L);
         }
 
         protected WriteHeadObjectFieldNode createWriteObjectIDNode() {

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/rubinius/StatPrimitiveNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/rubinius/StatPrimitiveNodes.java
@@ -251,7 +251,7 @@ public static abstract class StatReadPrimitiveNode extends RubiniusPrimitiveNode
 
         public StatReadPrimitiveNode(RubyContext context, SourceSection sourceSection) {
             super(context, sourceSection);
-            readStatNode = ReadHeadObjectFieldNodeGen.create(getContext(), getSourceSection(), STAT_IDENTIFIER, null, null);
+            readStatNode = ReadHeadObjectFieldNodeGen.create(STAT_IDENTIFIER, null);
         }
 
         public FileStat getStat(DynamicObject rubyStat) {

diff --git a/truffle/src/main/java/org/jruby/truffle/runtime/methods/SharedMethodInfo.java b/truffle/src/main/java/org/jruby/truffle/runtime/methods/SharedMethodInfo.java
@@ -84,7 +84,7 @@ public boolean needsCallerFrame() {
     }
 
     public SharedMethodInfo withName(String newName) {
-        return new SharedMethodInfo(sourceSection, lexicalScope, arity, newName, isBlock, argumentDescriptors, alwaysClone, false, false);
+        return new SharedMethodInfo(sourceSection, lexicalScope, arity, newName, isBlock, argumentDescriptors, alwaysClone, alwaysInline, needsCallerFrame);
     }
 
     @Override