first steps at singleClass(context) vs getSingletonClass()

Author: enebo

core/src/main/java/org/jruby/RubyBasicObject.java

@@ -477,6 +477,14 @@ public RubyClass getSingletonClass() {
         return klass;
     }
 
+    public RubyClass singletonClass(ThreadContext context) {
+        RubyClass klass = metaClass.toSingletonClass(this);
+
+        if (isFrozen()) klass.setFrozen(true);
+
+        return klass;
+    }
+
     /** rb_make_metaclass
      *
      * Will create a new meta class, insert this in the chain of
@@ -2597,13 +2605,8 @@ public IRubyObject instance_exec(ThreadContext context, IRubyObject[] args, Bloc
             throw context.runtime.newLocalJumpErrorNoBlock();
         }
 
-        RubyModule klazz;
-        if (isImmediate()) {
-            // Ruby uses Qnil here, we use "dummy" because we need a class
-            klazz = context.runtime.getDummy();
-        } else {
-            klazz = getSingletonClass();
-        }
+        RubyModule klazz = isImmediate() ?  // MRI uses Qnil here, we use "dummy" because we need a class
+                context.runtime.getDummy() : singletonClass(context);
 
         return yieldUnder(context, klazz, args, block, EvalType.INSTANCE_EVAL);
     }

core/src/main/java/org/jruby/RubyBignum.java

@@ -158,9 +158,15 @@ public BigInteger getBigIntegerValue() {
 
     @Override
     public RubyClass getSingletonClass() {
-        throw typeError(getRuntime().getCurrentContext(), "can't define singleton");
+        return singletonClass(getRuntime().getCurrentContext());
     }
 
+    @Override
+    public RubyClass singletonClass(ThreadContext context) {
+        throw typeError(context, "can't define singleton");
+    }
+
+
     /** Getter for property value.
      * @return Value of property value.
      */

core/src/main/java/org/jruby/RubyBinding.java

@@ -75,7 +75,7 @@ public static RubyClass createBindingClass(ThreadContext context, RubyClass Obje
                 reifiedClass(RubyBinding.class).
                 classIndex(ClassIndex.BINDING).
                 defineMethods(context, RubyBinding.class).
-                tap(c -> c.getSingletonClass().undefMethods(context, "new"));
+                tap(c -> c.singletonClass(context).undefMethods(context, "new"));
     }
 
     public Binding getBinding() {

core/src/main/java/org/jruby/RubyBoolean.java

@@ -93,6 +93,10 @@ public RubyClass getSingletonClass() {
         return metaClass;
     }
 
+    public RubyClass singletonClass(ThreadContext context) {
+        return metaClass;
+    }
+
     @Override
     public Class<?> getJavaClass() {
         return boolean.class;

core/src/main/java/org/jruby/RubyClass.java

@@ -2893,31 +2893,27 @@ public IRubyObject smartLoadNewUser(IRubyObject target, IRubyObject data) {
      */
     public IRubyObject smartLoadOldUser(IRubyObject data) {
         ThreadContext context = runtime.getCurrentContext();
-        CacheEntry cache;
-        if ((cache = getSingletonClass().cachedLoad).token == getSingletonClass().generation) {
-            return cache.method.call(context, this, cache.sourceModule, "_load", data);
-        } else {
-            cache = getSingletonClass().searchWithCache("respond_to?");
-            DynamicMethod method = cache.method;
-            if (!method.equals(runtime.getRespondToMethod()) && !method.isUndefined()) {
-
-                // custom respond_to?, cache nothing and use slow path
-                if (method.call(context, this, cache.sourceModule, "respond_to?", asSymbol(context, "_load")).isTrue()) {
-                    return callMethod(context, "_load", data);
-                } else {
-                    throw typeError(context, "class ", this, " needs to have method `_load'");
-                }
-
-            } else if (!(cache = getSingletonClass().searchWithCache("_load")).method.isUndefined()) {
-
-                // real _load defined, cache and call it
-                getSingletonClass().cachedLoad = cache;
-                return cache.method.call(context, this, cache.sourceModule, "_load", data);
-
+        var singleton = singletonClass(context);
+        CacheEntry cache = singleton.cachedLoad;
+        if (cache.token == singleton.generation) return cache.method.call(context, this, cache.sourceModule, "_load", data);
+
+        cache = singleton.searchWithCache("respond_to?");
+        DynamicMethod method = cache.method;
+        if (!method.equals(runtime.getRespondToMethod()) && !method.isUndefined()) {
+            // custom respond_to?, cache nothing and use slow path
+            if (method.call(context, this, cache.sourceModule, "respond_to?", asSymbol(context, "_load")).isTrue()) {
+                return callMethod(context, "_load", data);
             } else {
-                // provide an error, since it doesn't exist
                 throw typeError(context, "class ", this, " needs to have method `_load'");
             }
+        } else if (!(cache = singleton.searchWithCache("_load")).method.isUndefined()) {
+            // real _load defined, cache and call it
+            singleton.cachedLoad = cache;
+            return cache.method.call(context, this, cache.sourceModule, "_load", data);
+
+        } else {
+            // provide an error, since it doesn't exist
+            throw typeError(context, "class ", this, " needs to have method `_load'");
         }
     }
 

core/src/main/java/org/jruby/RubyComplex.java

@@ -79,7 +79,7 @@ public static RubyClass createComplexClass(ThreadContext context, RubyClass Nume
                 defineMethods(context, RubyComplex.class).
                 undefMethods(context, "<", "<=", ">", ">=", "between?", "clamp", "%", "div", "divmod", "floor", "ceil",
                         "modulo", "remainder", "round", "step", "truncate", "positive?", "negative?").
-                tap(c -> c.getSingletonClass().undefMethods(context, "allocate", "new")).
+                tap(c -> c.singletonClass(context).undefMethods(context, "allocate", "new")).
                 tap(c -> c.defineConstant("I", RubyComplex.convert(context, c, asFixnum(context, 0), asFixnum(context, 1))));
     }
 

core/src/main/java/org/jruby/RubyContinuation.java

@@ -62,7 +62,7 @@ public static RubyClass createContinuation(ThreadContext context, RubyClass obje
         return defineClass(context, "Continuation", objectClass, objectClass.getAllocator()).
                 reifiedClass(RubyContinuation.class).
                 classIndex(ClassIndex.CONTINUATION).
-                tap(c -> c.getSingletonClass().undefMethods(context, "new"));
+                tap(c -> c.singletonClass(context).undefMethods(context, "new"));
     }
 
     @Deprecated

core/src/main/java/org/jruby/RubyEncoding.java

@@ -79,7 +79,7 @@ public static RubyClass createEncodingClass(ThreadContext context, RubyClass Obj
                 kindOf(new RubyModule.JavaClassKindOf(RubyEncoding.class)).
                 classIndex(ClassIndex.ENCODING).
                 defineMethods(context, RubyEncoding.class).
-                tap(c -> c.getSingletonClass().undefMethods(context, "allocate"));
+                tap(c -> c.singletonClass(context).undefMethods(context, "allocate"));
     }
 
     private Encoding encoding;

core/src/main/java/org/jruby/RubyFile.java

@@ -121,7 +121,7 @@ public static RubyClass createFileClass(ThreadContext context, RubyClass IO) {
                 defineConstant(context, "PATH_SEPARATOR", pathSeparator);
 
         // For JRUBY-5276, physically define FileTest methods on File's singleton
-        File.getSingletonClass().defineMethods(context, RubyFileTest.FileTestFileMethods.class);
+        File.singletonClass(context).defineMethods(context, RubyFileTest.FileTestFileMethods.class);
 
         var FileConstants = File.defineModuleUnder(context, "Constants").
                 defineConstant(context, "RDONLY", asFixnum(context, OpenFlags.O_RDONLY.intValue())).
@@ -205,7 +205,7 @@ public static RubyClass createFileClass(ThreadContext context, RubyClass IO) {
         if (!Platform.IS_BSD) {
             // lchmod appears to be mostly a BSD-ism, not supported on Linux.
             // See https://github.com/jruby/jruby/issues/5547
-            File.getSingletonClass().searchMethod("lchmod").setNotImplemented(true);
+            File.singletonClass(context).searchMethod("lchmod").setNotImplemented(true);
         }
 
         return File;

core/src/main/java/org/jruby/RubyFixnum.java

@@ -180,9 +180,12 @@ public boolean isImmediate() {
     	return true;
     }
 
-    @Override
     public RubyClass getSingletonClass() {
-        throw typeError(getRuntime().getCurrentContext(), "can't define singleton");
+        return singletonClass(getRuntime().getCurrentContext());
+    }
+
+    public RubyClass singletonClass(ThreadContext context) {
+        throw typeError(context, "can't define singleton");
     }
 
     @Override