[GR-27063] Make Shape fields in RubyLanguage non-static

PullRequest: truffleruby/2127

Author: Nicolas Laurent

src/main/java/org/truffleruby/RubyContext.java

@@ -103,7 +103,7 @@ public class RubyContext {
     private final SafepointManager safepointManager = new SafepointManager(this);
     private final InteropManager interopManager = new InteropManager(this);
     private final CodeLoader codeLoader = new CodeLoader(this);
-    private final FeatureLoader featureLoader = new FeatureLoader(this);
+    private final FeatureLoader featureLoader;
     private final TraceManager traceManager;
     private final ReferenceProcessor referenceProcessor;
     private final FinalizationService finalizationService;
@@ -112,9 +112,9 @@ public class RubyContext {
     private final SharedObjects sharedObjects = new SharedObjects(this);
     private final AtExitManager atExitManager = new AtExitManager(this);
     private final CallStackManager callStack = new CallStackManager(this);
-    private final FrozenStringLiterals frozenStringLiterals = new FrozenStringLiterals(this);
+    private final FrozenStringLiterals frozenStringLiterals;
     private final CoreExceptions coreExceptions;
-    private final EncodingManager encodingManager = new EncodingManager(this);
+    private final EncodingManager encodingManager;
     private final MetricsProfiler metricsProfiler = new MetricsProfiler(this);
     private final WeakValueCache<RegexpCacheKey, Regex> regexpCache = new WeakValueCache<>();
     private final PreInitializationManager preInitializationManager;
@@ -165,8 +165,11 @@ public RubyContext(RubyLanguage language, TruffleLanguage.Env env) {
 
         options = createOptions(env, language.options);
 
+        frozenStringLiterals = new FrozenStringLiterals(this, language);
         coreExceptions = new CoreExceptions(this, language);
+        encodingManager = new EncodingManager(this, language);
 
+        featureLoader = new FeatureLoader(this, language);
         referenceProcessor = new ReferenceProcessor(this);
         finalizationService = new FinalizationService(this, referenceProcessor);
         markingService = new MarkingService(this, referenceProcessor);
@@ -176,16 +179,16 @@ public RubyContext(RubyLanguage language, TruffleLanguage.Env env) {
 
         hashing = new Hashing(generateHashingSeed());
 
-        defaultBacktraceFormatter = BacktraceFormatter.createDefaultFormatter(this);
-        userBacktraceFormatter = new BacktraceFormatter(this, BacktraceFormatter.USER_BACKTRACE_FLAGS);
+        defaultBacktraceFormatter = BacktraceFormatter.createDefaultFormatter(this, language);
+        userBacktraceFormatter = new BacktraceFormatter(this, language, BacktraceFormatter.USER_BACKTRACE_FLAGS);
 
         rubyHome = findRubyHome(options);
         rubyHomeTruffleFile = rubyHome == null ? null : env.getInternalTruffleFile(rubyHome);
 
         // Load the core library classes
 
         Metrics.printTime("before-create-core-library");
-        coreLibrary = new CoreLibrary(this);
+        coreLibrary = new CoreLibrary(this, language);
         nativeConfiguration = NativeConfiguration.loadNativeConfiguration(this);
         coreLibrary.initialize();
         valueWrapperManager = new ValueWrapperManager(this);
@@ -205,7 +208,7 @@ public RubyContext(RubyLanguage language, TruffleLanguage.Env env) {
         Metrics.printTime("after-initialize-encodings");
 
         Metrics.printTime("before-thread-manager");
-        threadManager = new ThreadManager(this);
+        threadManager = new ThreadManager(this, language);
         threadManager.initialize(truffleNFIPlatform, nativeConfiguration);
         threadManager.initializeMainThread(Thread.currentThread());
         Metrics.printTime("after-thread-manager");
@@ -285,7 +288,7 @@ protected boolean patch(Env newEnv) {
         random = createRandomInstance();
         hashing.patchSeed(generateHashingSeed());
 
-        this.defaultBacktraceFormatter = BacktraceFormatter.createDefaultFormatter(this);
+        this.defaultBacktraceFormatter = BacktraceFormatter.createDefaultFormatter(this, language);
 
         this.truffleNFIPlatform = createNativePlatform();
         encodingManager.initializeDefaultEncodings(truffleNFIPlatform, nativeConfiguration);
@@ -663,7 +666,7 @@ public ConsoleHolder getConsoleHolder() {
         if (consoleHolder == null) {
             synchronized (this) {
                 if (consoleHolder == null) {
-                    consoleHolder = ConsoleHolder.create(this);
+                    consoleHolder = ConsoleHolder.create(this, language);
                 }
             }
         }

src/main/java/org/truffleruby/RubyLanguage.java

@@ -156,47 +156,42 @@ public class RubyLanguage extends TruffleLanguage<RubyContext> {
     public final Shape moduleShape = createShape(RubyModule.class);
     public final Shape classShape = createShape(RubyClass.class);
 
-    // TODO (eregon, 25 Sep 2020): These Shapes should ideally be stored in the language instance,
-    // so different Engines/RubyLanguage instances can have different type profiles.
-    // However that requires passing the language instance around a lot which is inconvenient
-    // and does not seem worth it currently. Also these builtin types are rather unlikely to have
-    // instance variables.
-    public static final Shape arrayShape = createShape(RubyArray.class);
-    public static final Shape atomicReferenceShape = createShape(RubyAtomicReference.class);
-    public static final Shape bigDecimalShape = createShape(RubyBigDecimal.class);
-    public static final Shape bindingShape = createShape(RubyBinding.class);
-    public static final Shape byteArrayShape = createShape(RubyByteArray.class);
-    public static final Shape conditionVariableShape = createShape(RubyConditionVariable.class);
-    public static final Shape digestShape = createShape(RubyDigest.class);
-    public static final Shape encodingConverterShape = createShape(RubyEncodingConverter.class);
-    public static final Shape encodingShape = createShape(RubyEncoding.class);
-    public static final Shape exceptionShape = createShape(RubyException.class);
-    public static final Shape fiberShape = createShape(RubyFiber.class);
-    public static final Shape handleShape = createShape(RubyHandle.class);
-    public static final Shape hashShape = createShape(RubyHash.class);
-    public static final Shape intRangeShape = createShape(RubyIntRange.class);
-    public static final Shape ioShape = createShape(RubyIO.class);
-    public static final Shape longRangeShape = createShape(RubyLongRange.class);
-    public static final Shape matchDataShape = createShape(RubyMatchData.class);
-    public static final Shape methodShape = createShape(RubyMethod.class);
-    public static final Shape mutexShape = createShape(RubyMutex.class);
-    public static final Shape nameErrorShape = createShape(RubyNameError.class);
-    public static final Shape noMethodErrorShape = createShape(RubyNoMethodError.class);
-    public static final Shape objectRangeShape = createShape(RubyObjectRange.class);
-    public static final Shape procShape = createShape(RubyProc.class);
-    public static final Shape queueShape = createShape(RubyQueue.class);
-    public static final Shape randomizerShape = createShape(RubyRandomizer.class);
-    public static final Shape regexpShape = createShape(RubyRegexp.class);
-    public static final Shape sizedQueueShape = createShape(RubySizedQueue.class);
-    public static final Shape stringShape = createShape(RubyString.class);
-    public static final Shape systemCallErrorShape = createShape(RubySystemCallError.class);
-    public static final Shape threadBacktraceLocationShape = createShape(RubyBacktraceLocation.class);
-    public static final Shape threadShape = createShape(RubyThread.class);
-    public static final Shape timeShape = createShape(RubyTime.class);
-    public static final Shape tracePointShape = createShape(RubyTracePoint.class);
-    public static final Shape truffleFFIPointerShape = createShape(RubyPointer.class);
-    public static final Shape unboundMethodShape = createShape(RubyUnboundMethod.class);
-    public static final Shape weakMapShape = createShape(RubyWeakMap.class);
+    public final Shape arrayShape = createShape(RubyArray.class);
+    public final Shape atomicReferenceShape = createShape(RubyAtomicReference.class);
+    public final Shape bigDecimalShape = createShape(RubyBigDecimal.class);
+    public final Shape bindingShape = createShape(RubyBinding.class);
+    public final Shape byteArrayShape = createShape(RubyByteArray.class);
+    public final Shape conditionVariableShape = createShape(RubyConditionVariable.class);
+    public final Shape digestShape = createShape(RubyDigest.class);
+    public final Shape encodingConverterShape = createShape(RubyEncodingConverter.class);
+    public final Shape encodingShape = createShape(RubyEncoding.class);
+    public final Shape exceptionShape = createShape(RubyException.class);
+    public final Shape fiberShape = createShape(RubyFiber.class);
+    public final Shape handleShape = createShape(RubyHandle.class);
+    public final Shape hashShape = createShape(RubyHash.class);
+    public final Shape intRangeShape = createShape(RubyIntRange.class);
+    public final Shape ioShape = createShape(RubyIO.class);
+    public final Shape longRangeShape = createShape(RubyLongRange.class);
+    public final Shape matchDataShape = createShape(RubyMatchData.class);
+    public final Shape methodShape = createShape(RubyMethod.class);
+    public final Shape mutexShape = createShape(RubyMutex.class);
+    public final Shape nameErrorShape = createShape(RubyNameError.class);
+    public final Shape noMethodErrorShape = createShape(RubyNoMethodError.class);
+    public final Shape objectRangeShape = createShape(RubyObjectRange.class);
+    public final Shape procShape = createShape(RubyProc.class);
+    public final Shape queueShape = createShape(RubyQueue.class);
+    public final Shape randomizerShape = createShape(RubyRandomizer.class);
+    public final Shape regexpShape = createShape(RubyRegexp.class);
+    public final Shape sizedQueueShape = createShape(RubySizedQueue.class);
+    public final Shape stringShape = createShape(RubyString.class);
+    public final Shape systemCallErrorShape = createShape(RubySystemCallError.class);
+    public final Shape threadBacktraceLocationShape = createShape(RubyBacktraceLocation.class);
+    public final Shape threadShape = createShape(RubyThread.class);
+    public final Shape timeShape = createShape(RubyTime.class);
+    public final Shape tracePointShape = createShape(RubyTracePoint.class);
+    public final Shape truffleFFIPointerShape = createShape(RubyPointer.class);
+    public final Shape unboundMethodShape = createShape(RubyUnboundMethod.class);
+    public final Shape weakMapShape = createShape(RubyWeakMap.class);
 
     public RubyLanguage() {
         coreMethodAssumptions = new CoreMethodAssumptions(this);

src/main/java/org/truffleruby/cext/CExtNodes.java

@@ -18,7 +18,6 @@
 import org.jcodings.specific.USASCIIEncoding;
 import org.jcodings.specific.UTF8Encoding;
 import org.truffleruby.Layouts;
-import org.truffleruby.RubyLanguage;
 import org.truffleruby.builtins.CoreMethod;
 import org.truffleruby.builtins.CoreMethodArrayArgumentsNode;
 import org.truffleruby.builtins.CoreMethodNode;
@@ -31,7 +30,6 @@
 import org.truffleruby.core.CoreLibrary;
 import org.truffleruby.core.MarkingService.ExtensionCallStack;
 import org.truffleruby.core.MarkingServiceNodes;
-import org.truffleruby.core.array.ArrayHelpers;
 import org.truffleruby.core.array.ArrayToObjectArrayNode;
 import org.truffleruby.core.array.RubyArray;
 import org.truffleruby.core.encoding.RubyEncoding;
@@ -358,7 +356,7 @@ private RubyArray bytes(BigInteger bi, int num_words, int word_length, boolean m
                     }
                 }
             }
-            return ArrayHelpers.createArray(getContext(), bytes);
+            return createArray(bytes);
         }
 
 
@@ -1027,7 +1025,7 @@ protected RubyPointer toNative(RubyString string,
 
             final RubyPointer instance = new RubyPointer(
                     coreLibrary().truffleFFIPointerClass,
-                    RubyLanguage.truffleFFIPointerShape,
+                    getLanguage().truffleFFIPointerShape,
                     nativeRope.getNativePointer());
             AllocationTracing.trace(instance, this);
             return instance;
@@ -1211,7 +1209,6 @@ protected Object rbTrEncMbcCaseFold(RubyEncoding enc, int flags, RubyString stri
                 System.arraycopy(to, 0, result, 0, resultLength);
             }
             return StringOperations.createString(
-                    getContext(),
                     this,
                     RopeOperations.create(result, USASCIIEncoding.INSTANCE, CodeRange.CR_UNKNOWN));
         }
@@ -1235,7 +1232,6 @@ protected Object rbTrEncMbcPut(RubyEncoding enc, int code) {
                 System.arraycopy(buf, 0, result, 0, resultLength);
             }
             return StringOperations.createString(
-                    getContext(),
                     this,
                     RopeOperations.create(result, USASCIIEncoding.INSTANCE, CodeRange.CR_UNKNOWN));
         }