intrinsified PyModule_AddObject

Author: tomasstupka

graalpython/com.oracle.graal.python.test/src/tests/cpyext/test_module.py

@@ -47,6 +47,14 @@
 class SubModuleType(ModuleType):
     pass
 
+def _reference_add_object(args):
+    if not isinstance(args[0], ModuleType):
+        if sys.version_info.minor >= 6:
+            raise SystemError
+        else:
+            return -1
+    args[0].__dict__[args[1]] = args[2]
+    return 0
 
 class TestPyModule(CPyExtTestCase):
 
@@ -137,4 +145,19 @@ def compile_module(self, name):
         resultspec="O",
         argspec='O',
         arguments=["PyObject* object"],
-    )
+    )
+        
+    test_PyModule_AddObject = CPyExtFunction(
+        _reference_add_object,
+        lambda: (
+            (1, "testAddObject", None),
+            (ModuleType("hello"), "testAddObject", None),
+            (ModuleType("hello"), "testAddObject", "a"),
+            (SubModuleType("subhello"), "testAddObject", "a"),
+        ),
+        resultspec="i",
+        argspec='OsO',
+        arguments=["PyObject* m", "const char* k", "PyObject* v"],
+        cmpfunc=unhandled_error_compare
+    )
+    

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

@@ -41,14 +41,12 @@
 package com.oracle.graal.python.builtins.modules.cext;
 
 import static com.oracle.graal.python.builtins.PythonBuiltinClassType.SystemError;
-import static com.oracle.graal.python.builtins.PythonBuiltinClassType.TypeError;
 import static com.oracle.graal.python.nodes.ErrorMessages.MODULE_S_HAS_NO;
-import static com.oracle.graal.python.nodes.ErrorMessages.S_NEEDS_NON_NULL_VALUE;
 import static com.oracle.graal.python.nodes.ErrorMessages.S_NEEDS_S_AS_FIRST_ARG;
-import static com.oracle.graal.python.nodes.SpecialAttributeNames.__DICT__;
 import static com.oracle.graal.python.nodes.SpecialAttributeNames.__DOC__;
 import static com.oracle.graal.python.nodes.SpecialAttributeNames.__NAME__;
 import static com.oracle.graal.python.nodes.SpecialAttributeNames.__PACKAGE__;
+import static com.oracle.graal.python.nodes.SpecialAttributeNames.__DICT__;
 
 import com.oracle.graal.python.annotations.ArgumentClinic;
 import com.oracle.graal.python.annotations.ArgumentClinic.ClinicConversion;
@@ -197,4 +195,58 @@ Object getName(VirtualFrame frame, Object o,
         }
     }
 
+    @Builtin(name = "PyModule_AddObject", minNumOfPositionalArgs = 3)
+    @GenerateNodeFactory
+    public abstract static class PyModuleAddObjectNode extends PythonTernaryBuiltinNode {
+        @Specialization(guards = "isModuleSubtype(frame, m, getClassNode, isSubtypeNode)")
+        Object addObject(VirtualFrame frame, Object m, String k, Object o,
+                        @SuppressWarnings("unused") @Cached GetClassNode getClassNode,
+                        @SuppressWarnings("unused") @Cached IsSubtypeNode isSubtypeNode,
+                        @Cached PyObjectLookupAttr lookupAttrNode,
+                        @Cached GetDictIfExistsNode getDictNode,
+                        @Cached BranchProfile noDictProfile,
+                        @CachedLibrary(limit = "3") HashingStorageLibrary lib,
+                        @Cached PRaiseNativeNode raiseNativeNode,
+                        @Cached TransformExceptionToNativeNode transformExceptionToNativeNode) {
+            try {
+                PDict dict = getDictNode.execute(m);
+                if (dict == null) {
+                    noDictProfile.enter();
+                    return raiseNativeNode.raiseInt(frame, -1, SystemError, MODULE_S_HAS_NO, lookupAttrNode.execute(frame, m, __NAME__), __DICT__);
+                }
+                lib.setItem(dict.getDictStorage(), k, o);
+                return 0;
+            } catch (PException e) {
+                transformExceptionToNativeNode.execute(e);
+                return -1;
+            }
+        }
+
+        @Specialization(guards = "isModuleSubtype(frame, m, getClassNode, isSubtypeNode)")
+        Object addObject(VirtualFrame frame, Object m, PString k, Object o,
+                        @SuppressWarnings("unused") @Cached GetClassNode getClassNode,
+                        @SuppressWarnings("unused") @Cached IsSubtypeNode isSubtypeNode,
+                        @Cached PyObjectLookupAttr lookupAttrNode,
+                        @Cached GetDictIfExistsNode getDictNode,
+                        @Cached BranchProfile noDictProfile,
+                        @CachedLibrary(limit = "3") HashingStorageLibrary lib,
+                        @Cached PRaiseNativeNode raiseNativeNode,
+                        @Cached TransformExceptionToNativeNode transformExceptionToNativeNode) {
+            return addObject(frame, m, k.getValue(), o, getClassNode, isSubtypeNode, lookupAttrNode, getDictNode, noDictProfile, lib, raiseNativeNode, transformExceptionToNativeNode);
+        }
+
+        @SuppressWarnings("unused")
+        @Specialization(guards = "!isModuleSubtype(frame, m, getClassNode, isSubtypeNode)")
+        public Object pop(VirtualFrame frame, Object m, Object key, Object defaultValue,
+                        @SuppressWarnings("unused") @Cached GetClassNode getClassNode,
+                        @SuppressWarnings("unused") @Cached IsSubtypeNode isSubtypeNode,
+                        @Cached PRaiseNativeNode raiseNativeNode) {
+            return raiseNativeNode.raiseInt(frame, -1, SystemError, S_NEEDS_S_AS_FIRST_ARG, "PyModule_AddObject", "module");
+        }
+
+        protected boolean isModuleSubtype(VirtualFrame frame, Object obj, GetClassNode getClassNode, IsSubtypeNode isSubtypeNode) {
+            return isSubtypeNode.execute(frame, getClassNode.execute(obj), PythonBuiltinClassType.PythonModule);
+        }
+    }
+
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/ErrorMessages.java

@@ -439,6 +439,7 @@ public abstract class ErrorMessages {
     public static final String MISSING_S = "Missing %s";
     public static final String MMAP_INDEX_OUT_OF_RANGE = "mmap index out of range";
     public static final String MODULE_HAS_NO_ATTR_S = "module has no attribute '%s'";
+    public static final String MODULE_S_HAS_NO = "module '%s' has no %s";
     public static final String MODULE_PARTIALLY_INITIALIZED_S_HAS_NO_ATTR_S = "partially initialized module '%s' has no attribute '%s' (most likely due to a circular import)";
     public static final String MODULE_S_HAS_NO_ATTR_S = "module '%s' has no attribute '%s'";
     public static final String MULTI_DIMENSIONAL_SUB_VIEWS_NOT_IMPLEMENTED = "multi-dimensional sub-views are not implemented";
@@ -476,6 +477,7 @@ public abstract class ErrorMessages {
     public static final String NATIVE_S_SUBTYPES_NOT_IMPLEMENTED = "native %s subtypes not implemented";
     public static final String NEED_BYTELIKE_OBJ = "decoding to str: need a bytes-like object, %p found";
     public static final String DECODING_STR_NOT_SUPPORTED = "decoding str is not supported";
+    public static final String S_NEEDS_S_AS_FIRST_ARG = "%s() needs %s as first arg";
     public static final String NEG_INF_PLUS_INF_IN = "-inf + inf in fsum";
     public static final String NEGATIVE_COUNT = "negative count";
     public static final String NEGATIVE_DATA_SIZE = "negative data size";

graalpython/lib-graalpython/python_cext.py

@@ -50,12 +50,6 @@ def decorator(fun):
             return make_may_raise_wrapper(fun, error_result)
         return decorator
 
-@may_raise(-1)
-def PyModule_AddObject(m, k, v):
-    m.__dict__[k] = v
-    return 0
-
-
 def METH_UNSUPPORTED():
     raise NotImplementedError("unsupported message type")