[GR-52132] Fix ctypes issues observed running PyBoy

PullRequest: graalpython/3193

Author: timfel

graalpython/com.oracle.graal.python.processor/src/com/oracle/graal/python/processor/CApiBuiltinsProcessor.java

@@ -98,6 +98,9 @@ public Object visitVariable(VariableTree variableTree, Trees trees) {
     private Trees trees;
 
     private String getFieldInitializer(VariableElement theField) {
+        if (trees == null) {
+            return "";
+        }
         if (argDescriptorToInitializer.isEmpty()) {
             // lazily initialize all arg descriptors in a single scan
             var codeScanner = new ArgDescriptorsTreeScanner();
@@ -115,7 +118,13 @@ private String getFieldInitializer(VariableElement theField) {
     @Override
     public synchronized void init(ProcessingEnvironment pe) {
         super.init(pe);
-        this.trees = Trees.instance(pe);
+        try {
+            this.trees = Trees.instance(pe);
+        } catch (Throwable t) {
+            // ECJ does not support this, so we skip the some processing of C API builtins
+            pe.getMessager().printWarning("The compiler does not support source tree parsing during annotation processing. Regeneration of Python C API builtins will be incorrect.");
+            this.trees = null;
+        }
     }
 
     private String getCSignature(VariableElement obj) {
@@ -425,6 +434,9 @@ private void compareFunction(String name, VariableElement ret1, VariableElement
     }
 
     private void compareFunction(String name, VariableElement ret1, String ret2, VariableElement[] args1, String[] args2) {
+        if (trees == null) {
+            return; // This isn't correct without parsing
+        }
         if (!isSimilarType(getCSignature(ret1), ret2)) {
             processingEnv.getMessager().printError("duplicate entry for " + name + ", different return " + ret1 + " vs. " + ret2);
         }
@@ -890,11 +902,17 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
             return true;
         }
         try {
-            generateCApiSource(allBuiltins, constants, fields, structs);
-            generateCApiHeader(javaBuiltins, methodFlags);
+            if (trees != null) {
+                // needs jdk.compiler
+                generateCApiSource(allBuiltins, constants, fields, structs);
+                generateCApiHeader(javaBuiltins, methodFlags);
+            }
             generateBuiltinRegistry(javaBuiltins);
             generateCApiAsserts(allBuiltins);
-            checkImports(allBuiltins);
+            if (trees != null) {
+                // needs jdk.compiler
+                checkImports(allBuiltins);
+            }
         } catch (IOException e) {
             processingEnv.getMessager().printError(e.getMessage());
         }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ctypes/PyCFuncPtrBuiltins.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -184,7 +184,7 @@ static Object simple(Object type, @SuppressWarnings("unused") Object[] args, @Su
             return pyCDataNewNode.execute(inliningTarget, type, dict);
         }
 
-        @Specialization(guards = {"args.length <= 1", "isTuple(args)"})
+        @Specialization(guards = {"args.length == 1", "isTuple(args)"})
         static Object fromNativeLibrary(VirtualFrame frame, Object type, Object[] args, @SuppressWarnings("unused") PKeyword[] kwds,
                         @Cached PyCFuncPtrFromDllNode pyCFuncPtrFromDllNode) {
             return pyCFuncPtrFromDllNode.execute(frame, type, args);
@@ -234,7 +234,7 @@ static Object callback(VirtualFrame frame, Object type, Object[] args, @Suppress
             return self;
         }
 
-        @Specialization(guards = {"args.length != 1", "!isPTuple(args)", "isLong(this, args, longCheckNode)"}, limit = "1")
+        @Specialization(guards = {"args.length > 1", "!isPTuple(args)", "isLong(this, args, longCheckNode)"}, limit = "1")
         static Object error(@SuppressWarnings("unused") Object type, @SuppressWarnings("unused") Object[] args, @SuppressWarnings("unused") PKeyword[] kwds,
                         @SuppressWarnings("unused") @Bind("this") Node inliningTarget,
                         @SuppressWarnings("unused") @Exclusive @Cached PyLongCheckNode longCheckNode,

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ctypes/PyCPointerTypeBuiltins.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -197,7 +197,7 @@ static PyCArgObject byref(Node inliningTarget, Object obj,
             parg.tag = 'P';
             parg.pffi_type = ffi_type_pointer;
             parg.obj = cdata;
-            parg.valuePointer = cdata.b_ptr;
+            parg.valuePointer = cdata.b_ptr.createReference();
             return parg;
         }
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -72,8 +72,6 @@ private NativePointer() {
     /**
      * Returns an object representing a {@code NULL} pointer. This may also be used if
      * {@link PythonContext#isNativeAccessAllowed()} is {@code false}.
-     *
-     * @return
      */
     public static NativePointer createNull() {
         return new NativePointer();

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/type/TypeBuiltins.java

@@ -1435,6 +1435,7 @@ static Object set(Object self, Object value,
     @Builtin(name = J___DIR__, minNumOfPositionalArgs = 1, doc = "__dir__ for type objects\n\n\tThis includes all attributes of klass and all of the base\n\tclasses recursively.")
     @GenerateNodeFactory
     public abstract static class DirNode extends PythonUnaryBuiltinNode {
+        @Override
         public abstract PSet execute(VirtualFrame frame, Object klass);
 
         @Specialization

mx.graalpython/suite.py

@@ -459,7 +459,6 @@
                 "GRAALPYTHON_PROCESSOR",
                 "truffle:TRUFFLE_DSL_PROCESSOR"
             ],
-            "forceJavac": True, # GRAALPYTHON_PROCESSOR is not compatible with ECJ
             "workingSets": "Truffle,Python",
             "testProject": True,
             "javaProperties": {