[Truffle] Call #singleton_method_added when adding a method to a sing…

…leton class. * All singleton classes know their only instance now.
jruby · Mar 1, 2016 · 9bda28a · 9bda28a
1 parent bda5bf9
commit 9bda28a
Showing 6 changed files with 11 additions and 20 deletions.
diff --git a/spec/truffle/tags/core/basicobject/singleton_method_added_tags.txt b/spec/truffle/tags/core/basicobject/singleton_method_added_tags.txt
@@ -1,8 +1 @@
 fails:BasicObject#singleton_method_added is a private method
-fails:BasicObject#singleton_method_added is called when a method is defined on self
-fails:BasicObject#singleton_method_added is called when a method is defined in the singleton class
-fails:BasicObject#singleton_method_added is called when a method is defined with alias_method in the singleton class
-fails:BasicObject#singleton_method_added is called when a method is defined with syntax alias in the singleton class
-fails:BasicObject#singleton_method_added is called when define_method is used in the singleton class
-fails:BasicObject#singleton_method_added is called when a singleton method is defined on an object
-fails:BasicObject#singleton_method_added is called when a singleton method is defined on a module
diff --git a/spec/truffle/tags/core/module/method_added_tags.txt b/spec/truffle/tags/core/module/method_added_tags.txt
diff --git a/truffle/src/main/java/org/jruby/truffle/core/klass/ClassNodes.java b/truffle/src/main/java/org/jruby/truffle/core/klass/ClassNodes.java
@@ -108,7 +108,7 @@ public static DynamicObject createSingletonClassOfObject(RubyContext context, Dy
         // See rb_singleton_class() documentation in MRI.
         // Allocator is null here, we cannot create instances of singleton classes.
         assert RubyGuards.isRubyClass(superclass);
-        assert attached == null || RubyGuards.isRubyModule(attached);
+        assert attached != null;
         return ensureSingletonConsistency(context, createRubyClass(context, Layouts.BASIC_OBJECT.getLogicalClass(superclass), null, superclass, name, true, attached));
     }
 

diff --git a/truffle/src/main/java/org/jruby/truffle/core/module/ModuleFields.java b/truffle/src/main/java/org/jruby/truffle/core/module/ModuleFields.java
@@ -22,6 +22,7 @@
 import org.jruby.truffle.core.Layouts;
 import org.jruby.truffle.core.klass.ClassNodes;
 import org.jruby.truffle.core.method.MethodFilter;
+import org.jruby.truffle.core.module.ModuleNodes.IsSingletonClassNode;
 import org.jruby.truffle.language.RubyConstant;
 import org.jruby.truffle.language.RubyGuards;
 import org.jruby.truffle.language.RubyNode;
@@ -31,7 +32,6 @@
 import org.jruby.truffle.language.objects.IsFrozenNodeGen;
 import org.jruby.truffle.language.objects.ObjectGraphNode;
 import org.jruby.truffle.language.objects.ObjectIDOperations;
-
 import java.util.ArrayDeque;
 import java.util.Collection;
 import java.util.Collections;
@@ -348,7 +348,12 @@ public void addMethod(RubyContext context, Node currentNode, InternalMethod meth
         newVersion();
 
         if (context.getCoreLibrary().isLoaded() && !method.isUndefined()) {
-            context.send(rubyModuleObject, "method_added", null, context.getSymbolTable().getSymbol(method.getName()));
+            if (Layouts.CLASS.isClass(rubyModuleObject) && Layouts.CLASS.getIsSingleton(rubyModuleObject)) {
+                DynamicObject receiver = Layouts.CLASS.getAttached(rubyModuleObject);
+                context.send(receiver, "singleton_method_added", null, context.getSymbolTable().getSymbol(method.getName()));
+            } else {
+                context.send(rubyModuleObject, "method_added", null, context.getSymbolTable().getSymbol(method.getName()));
+            }
         }
     }
 

diff --git a/truffle/src/main/java/org/jruby/truffle/core/module/ModuleOperations.java b/truffle/src/main/java/org/jruby/truffle/core/module/ModuleOperations.java
@@ -385,10 +385,10 @@ private static <R> R classVariableLookup(DynamicObject module, Function1<R, Dyna
             return result;
         }
 
-        // If singleton class, check attached module.
+        // If singleton class of a module, check the attached module.
         if (RubyGuards.isRubyClass(module)) {
             DynamicObject klass = module;
-            if (Layouts.CLASS.getIsSingleton(klass) && Layouts.CLASS.getAttached(klass) != null) {
+            if (Layouts.CLASS.getIsSingleton(klass) && Layouts.MODULE.isModule(Layouts.CLASS.getAttached(klass))) {
                 module = Layouts.CLASS.getAttached(klass);
 
                 result = action.apply(module);

diff --git a/truffle/src/main/java/org/jruby/truffle/language/objects/SingletonClassNode.java b/truffle/src/main/java/org/jruby/truffle/language/objects/SingletonClassNode.java
@@ -145,17 +145,11 @@ protected DynamicObject getSingletonClassForInstance(DynamicObject object) {
 
         final DynamicObject logicalClass = Layouts.BASIC_OBJECT.getLogicalClass(object);
 
-        DynamicObject attached = null;
-
-        if (RubyGuards.isRubyModule(object)) {
-            attached = object;
-        }
-
         final String name = String.format("#<Class:#<%s:0x%x>>", Layouts.MODULE.getFields(logicalClass).getName(),
                 ObjectIDOperations.verySlowGetObjectID(getContext(), object));
 
         final DynamicObject singletonClass = ClassNodes.createSingletonClassOfObject(
-                getContext(), logicalClass, attached, name);
+                getContext(), logicalClass, object, name);
 
         if (isFrozenNode == null) {
             isFrozenNode = insert(IsFrozenNodeGen.create(getContext(), getSourceSection(), null));