[GR-45141] Get rid of clinit cycle CExtContext<>CApiContext, remove unused logger

PullRequest: graalpython/2724

Author: timfel

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/DynamicObjectNativeWrapper.java

@@ -228,7 +228,6 @@
 @ExportLibrary(InteropLibrary.class)
 @ExportLibrary(value = NativeTypeLibrary.class, useForAOT = false)
 public abstract class DynamicObjectNativeWrapper extends PythonNativeWrapper {
-    private static final TruffleLogger LOGGER = CApiContext.getLogger(DynamicObjectNativeWrapper.class);
     static final String J_GP_OBJECT = "gp_object";
     static final TruffleString T_GP_OBJECT = tsLiteral(J_GP_OBJECT);
     static final TruffleString T_VALUE = tsLiteral("value");

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/common/CExtContext.java

@@ -93,7 +93,15 @@
 
 public abstract class CExtContext {
 
-    private static final TruffleLogger LOGGER = CApiContext.getLogger(CExtContext.class);
+    // Due to the cycle CExtContext -> CApiContext < CExtContext this needs to be done lazily
+    private static TruffleLogger LOGGER;
+
+    private static TruffleLogger getLogger() {
+        if (LOGGER == null) {
+            LOGGER = CApiContext.getLogger(CExtContext.class);
+        }
+        return LOGGER;
+    }
 
     public static final CExtContext LAZY_CONTEXT = new CExtContext(null, null) {
         @Override
@@ -325,12 +333,10 @@ public static Object loadCExtModule(Node location, PythonContext context, Module
             if (loaded) {
                 String name = spec.name.toJavaStringUncached();
                 if (!isForcedLLVM(name) && (nativeModuleOption.equals("all") || moduleMatches(name, nativeModuleOption.split(",")))) {
-                    if (cApiContext.supportsNativeBackend) {
-                        GraalHPyContext.loadJNIBackend();
-                        LOGGER.config("loading module " + spec.path + " as native");
-                        boolean panama = PythonOptions.UsePanama.getValue(PythonContext.get(null).getEnv().getOptions());
-                        library = GraalHPyContext.evalNFI(context, (panama ? "with panama " : "") + "load \"" + spec.path + "\"", "load " + spec.name);
-                    }
+                    GraalHPyContext.loadJNIBackend();
+                    getLogger().config("loading module " + spec.path + " as native");
+                    boolean panama = PythonOptions.UsePanama.getValue(PythonContext.get(null).getEnv().getOptions());
+                    library = GraalHPyContext.evalNFI(context, (panama ? "with panama " : "") + "load \"" + spec.path + "\"", "load " + spec.name);
                 }
             } else {
                 cApiContext.supportsNativeBackend = false;
@@ -342,12 +348,12 @@ public static Object loadCExtModule(Node location, PythonContext context, Module
             try {
                 if (InteropLibrary.getUncached(library).getLanguage(library).toString().startsWith("class com.oracle.truffle.nfi")) {
                     if (cApiContext.supportsNativeBackend) {
-                        LOGGER.config("loading module " + spec.path + " as native (no bitcode found)");
+                        getLogger().config("loading module " + spec.path + " as native (no bitcode found)");
                     } else {
                         throw PRaiseNode.raiseUncached(null, SystemError, ErrorMessages.CANNOT_MULTICONTEXT);
                     }
                 } else {
-                    LOGGER.config("loading module " + spec.path + " as llvm bitcode");
+                    getLogger().config("loading module " + spec.path + " as llvm bitcode");
                 }
             } catch (UnsupportedMessageException e) {
                 throw CompilerDirectives.shouldNotReachHere(e);