[Truffle] Add BasicObject#singleton_method_removed hook for remove_me…

…thod
jruby · Sep 5, 2016 · edb207a · edb207a
1 parent 27bc28f
commit edb207a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/spec/truffle/tags/core/basicobject/singleton_method_removed_tags.txt b/spec/truffle/tags/core/basicobject/singleton_method_removed_tags.txt
diff --git a/truffle/src/main/java/org/jruby/truffle/core/module/ModuleNodes.java b/truffle/src/main/java/org/jruby/truffle/core/module/ModuleNodes.java
@@ -1745,7 +1745,12 @@ private void removeMethod(VirtualFrame frame, DynamicObject module, String name)
 
             if (Layouts.MODULE.getFields(module).getMethod(name) != null) {
                 Layouts.MODULE.getFields(module).removeMethod(name);
-                methodRemovedNode.call(frame, module, "method_removed", getSymbol(name));
+                if(Layouts.CLASS.isClass(module) && Layouts.CLASS.getIsSingleton(module)){
+                    final DynamicObject receiver = Layouts.CLASS.getAttached(module);
+                    methodRemovedNode.call(frame, receiver, "singleton_method_removed", getSymbol(name));
+                } else {
+                    methodRemovedNode.call(frame, module, "method_removed", getSymbol(name));
+                }
             } else {
                 errorProfile.enter();
                 throw new RaiseException(coreExceptions().nameErrorMethodNotDefinedIn(module, name, this));