Always write PyMethodDef pointer to built-in function

Author: fangerer

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextMethodBuiltins.java

@@ -98,6 +98,7 @@ static Object doNativeCallable(Node inliningTarget, Object methodDefPtr, Truffle
             Object f = createFunctionNode.execute(inliningTarget, name, methObj, wrapper, PNone.NO_VALUE, flags);
             assert f instanceof PBuiltinFunction;
             PBuiltinFunction func = (PBuiltinFunction) f;
+            writeHiddenAttrNode.execute(inliningTarget, func, METHOD_DEF_PTR, methodDefPtr);
             dylib.put(func, T___NAME__, name);
             dylib.put(func, T___DOC__, doc);
             PBuiltinMethod method;
@@ -107,7 +108,6 @@ static Object doNativeCallable(Node inliningTarget, Object methodDefPtr, Truffle
                 method = factory.createBuiltinMethod(self, func);
             }
             dylib.put(method, T___MODULE__, module);
-            writeHiddenAttrNode.execute(inliningTarget, method, METHOD_DEF_PTR, methodDefPtr);
             return method;
         }
     }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextTypeBuiltins.java

@@ -253,6 +253,8 @@ static Object classOrStatic(Node inliningTarget, Object methodDefPtr, TruffleStr
                         @CachedLibrary(limit = "1") DynamicObjectLibrary dylib,
                         @Exclusive @Cached CreateFunctionNode createFunctionNode) {
             Object func = createFunctionNode.execute(inliningTarget, name, methObj, wrapper, type, flags);
+            assert func instanceof PythonAbstractObject;
+            writeHiddenAttrNode.execute(inliningTarget, (PythonAbstractObject) func, METHOD_DEF_PTR, methodDefPtr);
             PythonObject function;
             if ((flags & METH_CLASS) != 0) {
                 function = factory.createClassmethodFromCallableObj(func);
@@ -261,7 +263,6 @@ static Object classOrStatic(Node inliningTarget, Object methodDefPtr, TruffleStr
             }
             dylib.put(function, T___NAME__, name);
             dylib.put(function, T___DOC__, doc);
-            writeHiddenAttrNode.execute(inliningTarget, function, METHOD_DEF_PTR, methodDefPtr);
             return function;
         }