No need to pass a SingletonClassNode for DeclarationContext#getModuleToDefineMethods()

Author: eregon

src/main/java/org/truffleruby/language/methods/DeclarationContext.java

@@ -17,11 +17,11 @@
 import org.truffleruby.core.module.RubyModule;
 import org.truffleruby.language.Visibility;
 import org.truffleruby.language.arguments.RubyArguments;
-import org.truffleruby.language.objects.SingletonClassNode;
 
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.frame.Frame;
+import org.truffleruby.language.objects.SingletonClassNode;
 
 /** The set of values captured when a method is defined:
  * <ul>
@@ -35,7 +35,7 @@ public class DeclarationContext {
 
     /** @see <a href="http://yugui.jp/articles/846">http://yugui.jp/articles/846</a> */
     private interface DefaultDefinee {
-        RubyModule getModuleToDefineMethods(SingletonClassNode singletonClassNode);
+        RubyModule getModuleToDefineMethods();
     }
 
     /** #instance_eval, the default definee is self.singleton_class */
@@ -46,8 +46,8 @@ public SingletonClassOfSelfDefaultDefinee(Object self) {
             this.self = self;
         }
 
-        public RubyModule getModuleToDefineMethods(SingletonClassNode singletonClassNode) {
-            return singletonClassNode.executeSingletonClass(self);
+        public RubyModule getModuleToDefineMethods() {
+            return SingletonClassNode.getUncached().executeSingletonClass(self);
         }
     }
 
@@ -59,7 +59,7 @@ public FixedDefaultDefinee(RubyModule module) {
             this.module = module;
         }
 
-        public RubyModule getModuleToDefineMethods(SingletonClassNode singletonClassNode) {
+        public RubyModule getModuleToDefineMethods() {
             return module;
         }
     }
@@ -159,9 +159,9 @@ public RubyModule[] getRefinementsFor(RubyModule module) {
     }
 
     @TruffleBoundary
-    public RubyModule getModuleToDefineMethods(SingletonClassNode singletonClassNode) {
+    public RubyModule getModuleToDefineMethods() {
         assert defaultDefinee != null : "Trying to find the default definee but this method should not have method definitions inside";
-        return defaultDefinee.getModuleToDefineMethods(singletonClassNode);
+        return defaultDefinee.getModuleToDefineMethods();
     }
 
     public boolean hasRefinements() {

src/main/java/org/truffleruby/language/methods/GetDefaultDefineeNode.java

@@ -12,26 +12,12 @@
 import org.truffleruby.core.module.RubyModule;
 import org.truffleruby.language.RubyContextSourceNode;
 import org.truffleruby.language.arguments.RubyArguments;
-import org.truffleruby.language.objects.SingletonClassNode;
 
-import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.frame.VirtualFrame;
 
 public class GetDefaultDefineeNode extends RubyContextSourceNode {
-
-    @Child private SingletonClassNode singletonClassNode;
-
     @Override
     public RubyModule execute(VirtualFrame frame) {
-        final DeclarationContext declarationContext = RubyArguments.getDeclarationContext(frame);
-        return declarationContext.getModuleToDefineMethods(getSingletonClassNode());
-    }
-
-    private SingletonClassNode getSingletonClassNode() {
-        if (singletonClassNode == null) {
-            CompilerDirectives.transferToInterpreterAndInvalidate();
-            singletonClassNode = insert(SingletonClassNode.create());
-        }
-        return singletonClassNode;
+        return RubyArguments.getDeclarationContext(frame).getModuleToDefineMethods();
     }
 }