Load C API when using ctypes.dlopen

msimacek · msimacek · commit 28512bcf3d31 · 2024-06-05T17:59:01.000+02:00
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ctypes/CtypesModuleBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ctypes/CtypesModuleBuiltins.java
@@ -746,6 +746,9 @@ static Object py_dl_open(VirtualFrame frame, PythonModule self, TruffleString na
                 return factory.createNativeVoidPtr(((CtypesModuleBuiltins) self.getBuiltins()).rtldDefault);
             }
 
+            // The loaded library can link against libpython, so we have to make sure it is loaded
+            CApiContext.ensureCapiWasLoaded();
+
             int mode = m != Integer.MIN_VALUE ? m : RTLD_LOCAL.getValueIfDefined();
             mode |= RTLD_NOW.getValueIfDefined();
             PythonContext context = PythonContext.get(inliningTarget);

Original file line number	Diff line number	Diff line change
`@@ -746,6 +746,9 @@ static Object py_dl_open(VirtualFrame frame, PythonModule self, TruffleString na`
`746`	`746`	`return factory.createNativeVoidPtr(((CtypesModuleBuiltins) self.getBuiltins()).rtldDefault);`
`747`	`747`	`}`
`748`	`748`
	`749`	`+ // The loaded library can link against libpython, so we have to make sure it is loaded`
	`750`	`+ CApiContext.ensureCapiWasLoaded();`
	`751`	`+`
`749`	`752`	`int mode = m != Integer.MIN_VALUE ? m : RTLD_LOCAL.getValueIfDefined();`
`750`	`753`	`mode \|= RTLD_NOW.getValueIfDefined();`
`751`	`754`	`PythonContext context = PythonContext.get(inliningTarget);`