[Truffle] Fix error in Module#define_method with mis-matched classes.

jruby · Apr 5, 2015 · 5844ccd · 5844ccd
1 parent 1001fa0
commit 5844ccd
Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/spec/truffle/tags/core/kernel/define_singleton_method_tags.txt b/spec/truffle/tags/core/kernel/define_singleton_method_tags.txt
@@ -1 +1,2 @@
 fails:Kernel#define_singleton_method when given an UnboundMethod defines any Child class method from any Parent's class methods
+fails:Kernel#define_singleton_method when given an UnboundMethod will raise when attempting to define an object's singleton method from another object's singleton method
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/ModuleNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/ModuleNodes.java
@@ -972,9 +972,15 @@ public RubySymbol defineMethod(RubyModule module, String name, RubyMethod method
         }
 
         @Specialization
-        public RubySymbol defineMethod(RubyModule module, String name, RubyUnboundMethod method, UndefinedPlaceholder block) {
+        public RubySymbol defineMethod(VirtualFrame frame, RubyModule module, String name, RubyUnboundMethod method, UndefinedPlaceholder block) {
             notDesignedForCompilation();
 
+            if (module instanceof RubyClass && !ModuleOperations.assignableTo((RubyClass) module, method.getOrigin())) {
+                ruby(frame, "raise TypeError, 'bind argument must be a subclass of " + method.getOrigin().getName() + "'");
+            }
+
+            // TODO CS 5-Apr-15 TypeError if the method came from a singleton
+
             module.addMethod(this, method.getMethod().withNewName(name));
 
             return getContext().getSymbolTable().getSymbol(name);
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		fails:Kernel#define_singleton_method when given an UnboundMethod defines any Child class method from any Parent's class methods
		fails:Kernel#define_singleton_method when given an UnboundMethod will raise when attempting to define an object's singleton method from another object's singleton method