Add functions to access some PyCFunction fields

Author: msimacek

graalpython/com.oracle.graal.python.cext/include/cpython/methodobject.h

@@ -32,3 +32,10 @@ typedef struct {
     PyCFunctionObject func;
     PyTypeObject *mm_class; /* Class that defines this method */
 } PyCMethodObject;
+
+/*
+ * XXX These functions are GraalPy-only. We need them to replace field access in our patches.
+ * Currently used by (at least) cffi patch.
+ */
+PyAPI_FUNC(PyObject*) _PyCFunction_GetModule(PyObject* a);
+PyAPI_FUNC(PyMethodDef*) _PyCFunction_GetMethodDef(PyObject* a);

graalpython/com.oracle.graal.python.cext/src/methodobject.c

@@ -87,3 +87,11 @@ PyTypeObject * PyCFunction_GetClass(PyObject *func) {
 	PyMethodDef* def = PyCFunctionObject_m_ml(func);
 	return PyMethodDef_ml_flags(def) & METH_METHOD ? PyCMethodObject_mm_class(func) : NULL;
 }
+
+PyObject* _PyCFunction_GetModule(PyObject *func) {
+    return PyCFunctionObject_m_module(func);
+}
+
+PyMethodDef* _PyCFunction_GetMethodDef(PyObject *func) {
+    return PyCFunctionObject_m_ml(func);
+}

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

@@ -541,7 +541,7 @@ public static boolean assertBuiltins(Object capiLibrary) {
                     "PyMethodDescrObject_GetMethod", "PyObject_GetDoc", "PyObject_SetDoc", "PySlice_Start", "PySlice_Step", "PySlice_Stop", "_PyASCIIObject_LENGTH", "_PyASCIIObject_STATE_ASCII",
                     "_PyASCIIObject_STATE_COMPACT", "_PyASCIIObject_STATE_KIND", "_PyASCIIObject_STATE_READY", "_PyASCIIObject_WSTR", "_PyByteArray_Start", "_PyEval_SetCoroutineOriginTrackingDepth",
                     "_PyFrame_SetLineNumber", "_PyMemoryView_GetBuffer", "_PySequence_Fast_ITEMS", "_PySequence_ITEM", "_PyUnicodeObject_DATA", "_PyUnicode_get_wstr_length", "_Py_REFCNT",
-                    "_Py_SET_REFCNT", "_Py_SET_SIZE", "_Py_SET_TYPE", "_Py_SIZE", "_Py_TYPE", "_PyTuple_SET_ITEM"};
+                    "_Py_SET_REFCNT", "_Py_SET_SIZE", "_Py_SET_TYPE", "_Py_SIZE", "_Py_TYPE", "_PyTuple_SET_ITEM", "_PyCFunction_GetModule", "_PyCFunction_GetMethodDef"};
 
     /**
      * Check the list of implemented and unimplemented builtins against the list of CPython exported

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

@@ -484,6 +484,8 @@ public final class CApiFunction {
     @CApiBuiltin(name = "PyCFunction_GetFlags", ret = Int, args = {PyObject}, call = PolyglotImpl)
     @CApiBuiltin(name = "PyCFunction_GetFunction", ret = PY_C_FUNCTION, args = {PyObject}, call = PolyglotImpl)
     @CApiBuiltin(name = "PyCFunction_GetSelf", ret = PyObject, args = {PyObject}, call = PolyglotImpl)
+    @CApiBuiltin(name = "_PyCFunction_GetModule", ret = PyObject, args = {PyObject}, call = PolyglotImpl)
+    @CApiBuiltin(name = "_PyCFunction_GetMethodDef", ret = PyMethodDef, args = {PyObject}, call = PolyglotImpl)
     @CApiBuiltin(name = "PyCFunction_New", ret = PyObject, args = {PyMethodDef, PyObject}, call = PolyglotImpl)
     @CApiBuiltin(name = "PyCFunction_NewEx", ret = PyObject, args = {PyMethodDef, PyObject, PyObject}, call = PolyglotImpl)
     @CApiBuiltin(name = "PyCMethod_New", ret = PyObject, args = {PyMethodDef, PyObject, PyObject, PyTypeObject}, call = PolyglotImpl)