[Truffle] Fix UnboundMethod#bind.

jruby · Mar 24, 2015 · f75b331 · f75b331
1 parent 767c13b
commit f75b331
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 3 deletions.
diff --git a/spec/truffle/tags/core/unboundmethod/bind_tags.txt b/spec/truffle/tags/core/unboundmethod/bind_tags.txt
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/UnboundMethodNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/UnboundMethodNodes.java
@@ -9,13 +9,20 @@
  */
 package org.jruby.truffle.nodes.core;
 
+import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.dsl.Specialization;
+import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.source.NullSourceSection;
 import com.oracle.truffle.api.source.SourceSection;
 
 import org.jruby.runtime.Visibility;
+import org.jruby.truffle.nodes.objects.MetaClassNode;
+import org.jruby.truffle.nodes.objects.MetaClassNodeFactory;
+import org.jruby.truffle.runtime.ModuleOperations;
 import org.jruby.truffle.runtime.RubyContext;
+import org.jruby.truffle.runtime.control.RaiseException;
 import org.jruby.truffle.runtime.core.RubyArray;
+import org.jruby.truffle.runtime.core.RubyClass;
 import org.jruby.truffle.runtime.core.RubyMethod;
 import org.jruby.truffle.runtime.core.RubyModule;
 import org.jruby.truffle.runtime.core.RubyString;
@@ -46,16 +53,40 @@ public int arity(RubyUnboundMethod method) {
     @CoreMethod(names = "bind", required = 1)
     public abstract static class BindNode extends CoreMethodNode {
 
+        @Child private MetaClassNode metaClassNode;
+
         public BindNode(RubyContext context, SourceSection sourceSection) {
             super(context, sourceSection);
         }
 
         public BindNode(BindNode prev) {
             super(prev);
+            metaClassNode = prev.metaClassNode;
+        }
+
+        private RubyClass metaClass(VirtualFrame frame, Object object) {
+            if (metaClassNode == null) {
+                CompilerDirectives.transferToInterpreterAndInvalidate();
+                metaClassNode = insert(MetaClassNodeFactory.create(getContext(), getSourceSection(), null));
+            }
+            return metaClassNode.executeMetaClass(frame, object);
         }
 
         @Specialization
-        public RubyMethod bind(RubyUnboundMethod unboundMethod, Object object) {
+        public RubyMethod bind(VirtualFrame frame, RubyUnboundMethod unboundMethod, Object object) {
+            notDesignedForCompilation();
+            RubyModule module = unboundMethod.getMethod().getDeclaringModule();
+            if (!module.isOnlyAModule()) {
+                if (!ModuleOperations.assignableTo(metaClass(frame, object), module)) {
+                    CompilerDirectives.transferToInterpreter();
+                    if (((RubyClass) module).isSingleton()) {
+                        throw new RaiseException(getContext().getCoreLibrary().typeError("singleton method called for a different object", this));
+                    } else {
+                        throw new RaiseException(getContext().getCoreLibrary().typeError("bind argument must be an instance of " + module.getName(), this));
+                    }
+                }
+            }
+
             return new RubyMethod(getContext().getCoreLibrary().getMethodClass(), object, unboundMethod.getMethod());
         }