Initialize GraalHPyContext#slowPathFactory eagerly from the context

Author: steve-s

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

@@ -942,7 +942,7 @@ private void loadFile(String s, String prefix) {
         GenericInvokeNode.getUncached().execute(callTarget, PArguments.withGlobals(mod));
     }
 
-    public PythonObjectFactory factory() {
+    public PythonObjectSlowPathFactory factory() {
         return objectFactory;
     }
 

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

@@ -66,6 +66,7 @@
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.logging.Level;
 
+import com.oracle.graal.python.runtime.object.PythonObjectSlowPathFactory;
 import org.graalvm.nativeimage.ImageInfo;
 
 import com.oracle.graal.python.PythonLanguage;
@@ -771,10 +772,11 @@ public static GraalHPyNativeSymbol getGetterFunctionName(LLVMType llvmType) {
     @CompilationFinal private RootCallTarget referenceCleanerCallTarget;
     private Thread hpyReferenceCleanerThread;
 
-    private PythonObjectFactory slowPathFactory;
+    private final PythonObjectSlowPathFactory slowPathFactory;
 
     public GraalHPyContext(PythonContext context, Object hpyLibrary) {
         super(context, hpyLibrary, GraalHPyConversionNodeSupplier.HANDLE);
+        this.slowPathFactory = context.getCore().factory();
         this.hpyContextMembers = createMembers(context, getName());
         this.useNativeFastPaths = context.getLanguage().getEngineOption(PythonOptions.HPyEnableJNIFastPaths);
     }
@@ -1296,17 +1298,6 @@ void increment() {
         }
     }
 
-    /**
-     * Returns a Python object factory that should only be used on the slow path. The factory object
-     * is initialized lazily.
-     */
-    private PythonObjectFactory factory() {
-        if (slowPathFactory == null) {
-            slowPathFactory = getContext().getCore().factory();
-        }
-        return slowPathFactory;
-    }
-
     @SuppressWarnings("static-method")
     public final long ctxFloatFromDouble(double value) {
         Counter.UpcallFloatFromDouble.increment();
@@ -1376,7 +1367,7 @@ public final long ctxNew(long typeHandle, long dataOutVar) {
             long basicSize = clazz.basicSize;
             if (basicSize == -1) {
                 // create the managed Python object
-                pythonObject = factory().createPythonObject(clazz, clazz.getInstanceShape());
+                pythonObject = slowPathFactory.createPythonObject(clazz, clazz.getInstanceShape());
             } else {
                 /*
                  * Since this is a JNI upcall method, we know that (1) we are not running in some
@@ -1386,7 +1377,7 @@ public final long ctxNew(long typeHandle, long dataOutVar) {
                 long dataPtr = unsafe.allocateMemory(basicSize);
                 unsafe.setMemory(dataPtr, basicSize, (byte) 0);
                 unsafe.putLong(dataOutVar, dataPtr);
-                pythonObject = factory().createPythonHPyObject(clazz, dataPtr);
+                pythonObject = slowPathFactory.createPythonHPyObject(clazz, dataPtr);
                 Object destroyFunc = clazz.hpyDestroyFunc;
                 createHandleReference(pythonObject, dataPtr, destroyFunc != PNone.NO_VALUE ? destroyFunc : null);
             }
@@ -1396,7 +1387,7 @@ public final long ctxNew(long typeHandle, long dataOutVar) {
                 return HPyRaiseNodeGen.getUncached().raiseIntWithoutFrame(this, 0, PythonBuiltinClassType.TypeError, "HPy_New arg 1 must be a type");
             }
             // TODO(fa): this should actually call __new__
-            pythonObject = factory().createPythonObject(type);
+            pythonObject = slowPathFactory.createPythonObject(type);
         }
         return GraalHPyBoxing.boxHandle(createHandle(pythonObject).getId(this, ConditionProfile.getUncached()));
     }
@@ -1415,9 +1406,9 @@ public final long ctxTypeGenericNew(long typeHandle) {
                 // allocate native space
                 long dataPtr = unsafe.allocateMemory(basicSize);
                 unsafe.setMemory(dataPtr, basicSize, (byte) 0);
-                pythonObject = factory().createPythonHPyObject(clazz, dataPtr);
+                pythonObject = slowPathFactory.createPythonHPyObject(clazz, dataPtr);
             } else {
-                pythonObject = factory().createPythonObject(clazz);
+                pythonObject = slowPathFactory.createPythonObject(clazz);
             }
             return GraalHPyBoxing.boxHandle(createHandle(pythonObject).getId(this, ConditionProfile.getUncached()));
         }