jruby · Jan 5, 2016 · Jan 5, 2016 · Jan 5, 2016
Showing with 50 additions and 20 deletions.

+0 −1 spec/truffle/tags/core/marshal/dump_tags.txt

+36 −0 truffle/src/main/java/org/jruby/truffle/nodes/core/BasicObjectNodes.java

+14 −19 truffle/src/main/java/org/jruby/truffle/nodes/core/KernelNodes.java
diff --git a/spec/truffle/tags/core/marshal/dump_tags.txt b/spec/truffle/tags/core/marshal/dump_tags.txt
@@ -1,4 +1,3 @@
-fails:Marshal.dump with an Object dumps a BasicObject subclass if it defines respond_to?
 fails:Marshal.dump with a Time dumps the zone and the offset
 fails:Marshal.dump with a Time dumps the zone, but not the offset if zone is UTC
 fails:Marshal.dump with an Exception dumps the message for the exception

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/BasicObjectNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/BasicObjectNodes.java
@@ -36,9 +36,14 @@
 import org.jruby.truffle.runtime.NotProvided;
 import org.jruby.truffle.runtime.RubyContext;
 import org.jruby.truffle.runtime.control.RaiseException;
+import org.jruby.truffle.runtime.core.ArrayOperations;
 import org.jruby.truffle.runtime.core.StringOperations;
+import org.jruby.truffle.runtime.layouts.Layouts;
 import org.jruby.truffle.runtime.methods.InternalMethod;
 
+import java.util.Arrays;
+import java.util.List;
+
 @CoreClass(name = "BasicObject")
 public abstract class BasicObjectNodes {
 
@@ -183,6 +188,37 @@ public Object instanceExec(Object receiver, Object[] arguments, NotProvided bloc
 
     }
 
+    @RubiniusOnly
+    @CoreMethod(names = "__instance_variables__")
+    public abstract static class InstanceVariablesNode extends CoreMethodArrayArgumentsNode {
+
+        public InstanceVariablesNode(RubyContext context, SourceSection sourceSection) {
+            super(context, sourceSection);
+        }
+
+        public abstract DynamicObject executeObject(DynamicObject self);
+
+        @TruffleBoundary
+        @Specialization
+        public DynamicObject instanceVariables(DynamicObject self) {
+            List<Object> keys = self.getShape().getKeyList();
+            final Object[] instanceVariableNames = keys.toArray(new Object[keys.size()]);
+
+            Arrays.sort(instanceVariableNames);
+
+            final DynamicObject array = Layouts.ARRAY.createArray(getContext().getCoreLibrary().getArrayFactory(), null, 0);
+
+            for (Object name : instanceVariableNames) {
+                if (name instanceof String) {
+                    ArrayOperations.append(array, getSymbol((String) name));
+                }
+            }
+
+            return array;
+        }
+
+    }
+
     @CoreMethod(names = "method_missing", needsBlock = true, rest = true, optional = 1, visibility = Visibility.PRIVATE)
     public abstract static class MethodMissingNode extends CoreMethodArrayArgumentsNode {
 

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
@@ -1102,30 +1102,19 @@ public Object removeInstanceVariable(DynamicObject object, String name) {
 
     }
 
-    @CoreMethod(names = { "instance_variables", "__instance_variables__" })
+    @CoreMethod(names = "instance_variables")
     public abstract static class InstanceVariablesNode extends CoreMethodArrayArgumentsNode {
 
+        @Child private BasicObjectNodes.InstanceVariablesNode instanceVariablesNode;
+
         public InstanceVariablesNode(RubyContext context, SourceSection sourceSection) {
             super(context, sourceSection);
+            instanceVariablesNode = BasicObjectNodesFactory.InstanceVariablesNodeFactory.create(context, sourceSection, new RubyNode[] {});
         }
 
-        @TruffleBoundary
         @Specialization
-        public DynamicObject instanceVariables(DynamicObject self) {
-            List<Object> keys = self.getShape().getKeyList();
-            final Object[] instanceVariableNames = keys.toArray(new Object[keys.size()]);
-
-            Arrays.sort(instanceVariableNames);
-
-            final DynamicObject array = Layouts.ARRAY.createArray(getContext().getCoreLibrary().getArrayFactory(), null, 0);
-
-            for (Object name : instanceVariableNames) {
-                if (name instanceof String) {
-                    ArrayOperations.append(array, getSymbol((String) name));
-                }
-            }
-
-            return array;
+        public DynamicObject instanceVariables(VirtualFrame frame, DynamicObject self) {
+            return instanceVariablesNode.executeObject(self);
         }
 
     }
@@ -1614,6 +1603,7 @@ public abstract static class RespondToNode extends CoreMethodNode {
 
         @Child private DoesRespondDispatchHeadNode dispatch;
         @Child private DoesRespondDispatchHeadNode dispatchIgnoreVisibility;
+        @Child private DoesRespondDispatchHeadNode dispatchRespondToMissing;
         @Child private CallDispatchHeadNode respondToMissingNode;
         private final ConditionProfile ignoreVisibilityProfile = ConditionProfile.createBinaryProfile();
 
@@ -1622,6 +1612,7 @@ public RespondToNode(RubyContext context, SourceSection sourceSection) {
 
             dispatch = new DoesRespondDispatchHeadNode(context, false);
             dispatchIgnoreVisibility = new DoesRespondDispatchHeadNode(context, true);
+            dispatchRespondToMissing = new DoesRespondDispatchHeadNode(context, true);
         }
 
         public abstract boolean executeDoesRespondTo(VirtualFrame frame, Object object, Object name, boolean includeProtectedAndPrivate);
@@ -1643,8 +1634,10 @@ public boolean doesRespondToString(VirtualFrame frame, Object object, DynamicObj
 
             if (ret) {
                 return true;
-            } else {
+            } else if (dispatchRespondToMissing.doesRespondTo(frame, "respond_to_missing?", object)) {
                 return respondToMissing(frame, object, name, includeProtectedAndPrivate);
+            } else {
+                return false;
             }
         }
 
@@ -1660,8 +1653,10 @@ public boolean doesRespondToSymbol(VirtualFrame frame, Object object, DynamicObj
 
             if (ret) {
                 return true;
-            } else {
+            } else if (dispatchRespondToMissing.doesRespondTo(frame, "respond_to_missing?", object)) {
                 return respondToMissing(frame, object, name, includeProtectedAndPrivate);
+            } else {
+                return false;
             }
         }