Use PythonObjectSlowPathFactory as Python3Core.factory and share it everywhere

Author: steve-s

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/Python3Core.java

@@ -44,6 +44,7 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import com.oracle.graal.python.runtime.object.PythonObjectSlowPathFactory;
 import org.graalvm.nativeimage.ImageInfo;
 
 import com.oracle.graal.python.PythonLanguage;
@@ -606,7 +607,7 @@ private static PythonBuiltins[] initializeBuiltins(boolean nativeAccessAllowed)
      */
     private volatile boolean initialized;
 
-    private final PythonObjectFactory objectFactory = PythonObjectFactory.getUncached();
+    private PythonObjectSlowPathFactory objectFactory;
 
     public Python3Core(PythonParser parser, boolean isNativeSupportAllowed) {
         this.parser = parser;
@@ -643,6 +644,7 @@ public boolean isInitialized() {
      */
     public void initialize(PythonContext context) {
         singletonContext = context;
+        objectFactory = new PythonObjectSlowPathFactory(context.getAllocationReporter());
         initializeJavaCore();
         initializePython3Core(context.getCoreHomeOrFail());
         assert SpecialMethodSlot.checkSlotOverrides(this);

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ast/AstModuleBuiltins.java

@@ -53,6 +53,7 @@
 import com.oracle.graal.python.builtins.objects.type.PythonBuiltinClass;
 import com.oracle.graal.python.builtins.objects.type.PythonClass;
 import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
+import com.oracle.graal.python.runtime.object.PythonObjectFactory;
 import com.oracle.graal.python.runtime.object.PythonObjectSlowPathFactory;
 import com.oracle.truffle.api.dsl.NodeFactory;
 
@@ -80,7 +81,7 @@ public void postInitialize(Python3Core core) {
          * writable class fields.
          */
         PythonLanguage language = core.getLanguage();
-        PythonObjectSlowPathFactory factory = new PythonObjectSlowPathFactory(core.getContext().getAllocationReporter());
+        PythonObjectFactory factory = core.factory();
         PythonClass mod_type = makeType(language, factory, astModule, "mod", astType);
         PythonClass Module_type = makeType(language, factory, astModule, "Module", mod_type);
         PythonClass Interactive_type = makeType(language, factory, astModule, "Interactive", mod_type);
@@ -196,7 +197,7 @@ public void postInitialize(Python3Core core) {
         PythonClass TypeIgnore_type = makeType(language, factory, astModule, "TypeIgnore", type_ignore_type);
     }
 
-    private static PythonClass makeType(PythonLanguage language, PythonObjectSlowPathFactory factory, PythonModule astModule, String name, PythonAbstractClass base) {
+    private static PythonClass makeType(PythonLanguage language, PythonObjectFactory factory, PythonModule astModule, String name, PythonAbstractClass base) {
         PythonClass newType = factory.createPythonClassAndFixupSlots(language, PythonBuiltinClassType.PythonClass, name, new PythonAbstractClass[]{base});
         astModule.setAttribute(name, newType);
         return newType;

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/hpy/GraalHPyContext.java

@@ -197,7 +197,6 @@
 import com.oracle.graal.python.runtime.exception.PException;
 import com.oracle.graal.python.runtime.exception.PythonThreadKillException;
 import com.oracle.graal.python.runtime.object.PythonObjectFactory;
-import com.oracle.graal.python.runtime.object.PythonObjectSlowPathFactory;
 import com.oracle.graal.python.runtime.sequence.PSequence;
 import com.oracle.graal.python.runtime.sequence.storage.DoubleSequenceStorage;
 import com.oracle.graal.python.runtime.sequence.storage.IntSequenceStorage;
@@ -772,7 +771,7 @@ public static GraalHPyNativeSymbol getGetterFunctionName(LLVMType llvmType) {
     @CompilationFinal private RootCallTarget referenceCleanerCallTarget;
     private Thread hpyReferenceCleanerThread;
 
-    private PythonObjectSlowPathFactory slowPathFactory;
+    private PythonObjectFactory slowPathFactory;
 
     public GraalHPyContext(PythonContext context, Object hpyLibrary) {
         super(context, hpyLibrary, GraalHPyConversionNodeSupplier.HANDLE);
@@ -1301,9 +1300,9 @@ void increment() {
      * Returns a Python object factory that should only be used on the slow path. The factory object
      * is initialized lazily.
      */
-    private PythonObjectSlowPathFactory factory() {
+    private PythonObjectFactory factory() {
         if (slowPathFactory == null) {
-            slowPathFactory = new PythonObjectSlowPathFactory(getContext().getAllocationReporter());
+            slowPathFactory = getContext().getCore().factory();
         }
         return slowPathFactory;
     }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/object/PythonObjectSlowPathFactory.java

@@ -54,6 +54,9 @@
  * directly stores a reference to the {@link AllocationReporter} instead of doing a context lookup
  * and getting it from the context. This class is meant to be used on slow path where the context is
  * explicitly available.
+ * 
+ * Objects of this class should not be created directly, but retrieved from
+ * {@link com.oracle.graal.python.builtins.Python3Core}.
  */
 public final class PythonObjectSlowPathFactory extends PythonObjectFactory {