Ensure that InteorpLibrary accepts CApiBuiltinExecutable

fangerer · fangerer · commit 4ea32dc0dcad · 2024-04-02T09:50:27.000+02:00
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/CApiContext.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/CApiContext.java
@@ -1130,7 +1130,7 @@ void toNative() {
                     InteropLibrary lib = null;
                     for (int i = 0; i < PythonCextBuiltinRegistry.builtins.length; i++) {
                         CApiBuiltinExecutable capiBuiltinExecutable = getCAPIBuiltinExecutable(i);
-                        if (lib == null) {
+                        if (lib == null || !lib.accepts(capiBuiltinExecutable)) {
                             lib = InteropLibrary.getUncached(capiBuiltinExecutable);
                         }
                         assert lib.accepts(capiBuiltinExecutable);

Original file line number	Diff line number	Diff line change
`@@ -1130,7 +1130,7 @@ void toNative() {`
`1130`	`1130`	`InteropLibrary lib = null;`
`1131`	`1131`	`for (int i = 0; i < PythonCextBuiltinRegistry.builtins.length; i++) {`
`1132`	`1132`	`CApiBuiltinExecutable capiBuiltinExecutable = getCAPIBuiltinExecutable(i);`
`1133`		`- if (lib == null) {`
	`1133`	`+ if (lib == null \|\| !lib.accepts(capiBuiltinExecutable)) {`
`1134`	`1134`	`lib = InteropLibrary.getUncached(capiBuiltinExecutable);`
`1135`	`1135`	`}`
`1136`	`1136`	`assert lib.accepts(capiBuiltinExecutable);`