Merge pull request jruby#8541 from enebo/set_constant

most of constant settin and RubyModule to be TCified

Author: enebo

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

@@ -181,7 +181,7 @@ public IRubyObject inspect(IRubyObject receiver) {
         RubyString str = newString(context, "#<");
         String sharp = "#";
 
-        str.catString(getType().getName()).catString(": ");
+        str.catString(getType().getName(context)).catString(": ");
 
         RubyModule definedClass;
         RubyModule mklass = originModule;
@@ -215,16 +215,16 @@ public IRubyObject inspect(IRubyObject receiver) {
         } else {
             if (receiver instanceof RubyClass) {
                 str.catString("#<");
-                str.cat(mklass.rubyName());
+                str.cat(mklass.rubyName(context));
                 str.catString(":");
-                str.cat(((RubyClass) receiver).rubyName());
+                str.cat(((RubyClass) receiver).rubyName(context));
                 str.catString(">");
             } else {
-                str.cat(mklass.rubyName());
+                str.cat(mklass.rubyName(context));
             }
             if (definedClass != mklass) {
                 str.catString("(");
-                str.cat(definedClass.rubyName());
+                str.cat(definedClass.rubyName(context));
                 str.catString(")");
             }
         }

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

@@ -42,6 +42,7 @@
 import org.jruby.runtime.builtin.Variable;
 
 import static org.jruby.api.Convert.asBoolean;
+import static org.jruby.api.Create.newString;
 import static org.jruby.api.Error.typeError;
 import static org.jruby.runtime.invokedynamic.MethodNames.INSPECT;
 import static org.jruby.runtime.Helpers.invokedynamic;
@@ -198,7 +199,7 @@ public static RubyString convertToString(IRubyObject self) {
 
     public static IRubyObject anyToString(IRubyObject self) {
         final RubyClass metaClass = getMetaClass(self);
-        String cname = metaClass.getRealClass().getName();
+        String cname = metaClass.getRealClass().getName(metaClass.getRuntime().getCurrentContext());
         /* 6:tags 16:addr 1:eos */
         return metaClass.runtime.newString("#<" + cname + ":0x" + Integer.toHexString(System.identityHashCode(self)) + '>');
     }
@@ -230,27 +231,27 @@ public static IRubyObject dup(IRubyObject self) {
     }
 
     public static IRubyObject inspect(IRubyObject self) {
-        final Ruby runtime = getRuntime(self);
+        var context = getRuntime(self).getCurrentContext();;
         if (hasVariables(self)) {
             StringBuilder part = new StringBuilder();
-            String cname = getMetaClass(self).getRealClass().getName();
+            String cname = getMetaClass(self).getRealClass().getName(context);
             part.append("#<").append(cname).append(":0x");
             part.append(Integer.toHexString(System.identityHashCode(self)));
 
-            if (runtime.isInspecting(self)) {
+            if (context.runtime.isInspecting(self)) {
                 /* 6:tags 16:addr 1:eos */
                 part.append(" ...>");
-                return runtime.newString(part.toString());
+                return newString(context, part.toString());
             }
             try {
-                runtime.registerInspecting(self);
-                return runtime.newString(inspectObj(self, part).toString());
+                context.runtime.registerInspecting(self);
+                return newString(context, inspectObj(self, part).toString());
             } finally {
-                runtime.unregisterInspecting(self);
+                context.runtime.unregisterInspecting(self);
             }
         }
 
-        return Helpers.invoke(runtime.getCurrentContext(), self, "to_s");
+        return Helpers.invoke(context, self, "to_s");
     }
 
 

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

@@ -2,6 +2,7 @@
 
 import java.util.Map;
 
+import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
 
 public class IncludedModule extends RubyClass implements DelegatedModule {
@@ -35,8 +36,8 @@ public void setMetaClass(RubyClass newRubyClass) {
     }
 
     @Override
-    public String getName() {
-        return origin.getName();
+    public String getName(ThreadContext context) {
+        return origin.getName(context);
     }
 
     @Override

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

@@ -39,6 +39,7 @@
 import java.util.Set;
 
 import org.jruby.internal.runtime.methods.DynamicMethod;
+import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.Visibility;
 import org.jruby.runtime.builtin.IRubyObject;
 import org.jruby.runtime.builtin.Variable;
@@ -80,12 +81,11 @@ public IncludedModuleWrapper(Ruby runtime, RubyClass superClass, RubyModule orig
     @Override
     @Deprecated
     public IncludedModuleWrapper newIncludeClass(RubyClass superClass) {
-        IncludedModuleWrapper includedModule = new IncludedModuleWrapper(getRuntime(), superClass, getOrigin());
+        var context = getCurrentContext();
+        IncludedModuleWrapper includedModule = new IncludedModuleWrapper(context.runtime, superClass, getOrigin());
 
         // include its parent (and in turn that module's parents)
-        if (getSuperClass() != null) {
-            includedModule.includeModule(getSuperClass());
-        }
+        if (getSuperClass() != null) includedModule.includeModule(context, getSuperClass());
 
         return includedModule;
     }
@@ -161,8 +161,8 @@ protected IRubyObject constantTableRemove(String name) {
     }
 
     @Override
-    protected IRubyObject getAutoloadConstant(String name, boolean forceLoad) {
-        return origin.getAutoloadConstant(name, forceLoad);
+    protected IRubyObject getAutoloadConstant(ThreadContext context, String name, boolean forceLoad) {
+        return origin.getAutoloadConstant(context, name, forceLoad);
     }
 
     @Override

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

@@ -72,7 +72,7 @@ public static RubyClass createClass(ThreadContext context, RubyClass baseClass,
         RubyClass NativeException = defineClass(context, CLASS_NAME, baseClass, NativeException::new).
                 defineMethods(context, NativeException.class);
 
-        Object.deprecateConstant(context.runtime, CLASS_NAME);
+        Object.deprecateConstant(context, CLASS_NAME);
 
         return NativeException;
     }

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

@@ -36,6 +36,7 @@
 
 import org.jruby.internal.runtime.methods.DynamicMethod;
 import org.jruby.internal.runtime.methods.RefinedMarker;
+import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
 
 /**
@@ -120,8 +121,8 @@ public void setMetaClass(RubyClass newRubyClass) {
     }
 
     @Override
-    public String getName() {
-        return origin.getName();
+    public String getName(ThreadContext context) {
+        return origin.getName(context);
     }
 
     @Override
@@ -148,9 +149,10 @@ public RubyModule getNonIncludedClass() {
     public IRubyObject id() {
         return origin.id();
     }
+
     @Override
-    public void addMethod(String id, DynamicMethod method) {
-        super.addMethod(id, method);
+    public void addMethod(ThreadContext context, String id, DynamicMethod method) {
+        super.addMethod(context, id, method);
         method.setDefinedClass(origin);
     }
 
@@ -192,8 +194,8 @@ protected IRubyObject constantTableRemove(String name) {
     }
 
     @Override
-    protected IRubyObject getAutoloadConstant(String name, boolean forceLoad) {
-        return origin.getAutoloadConstant(name, forceLoad);
+    protected IRubyObject getAutoloadConstant(ThreadContext context, String name, boolean forceLoad) {
+        return origin.getAutoloadConstant(context, name, forceLoad);
     }
 
     @Override