Expose PyStopIterationObject.value

Author: msimacek

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

@@ -187,6 +187,7 @@ declare_type(PyMethodDescr_Type, method_descriptor, PyMethodDescrObject);
 declare_type(PyGetSetDescr_Type, getset_descriptor, PyGetSetDescrObject);
 declare_type(PyMemberDescr_Type, member_descriptor, PyMemberDescrObject);
 declare_type(_PyExc_BaseException, BaseException, PyBaseExceptionObject);
+declare_type(_PyExc_StopIteration, StopIteration, PyStopIterationObject);
 declare_type(PyBuffer_Type, buffer, PyBufferDecorator);
 declare_type(PyFunction_Type, function, PyFunctionObject);
 declare_type(PyMethod_Type, method, PyMethodObject);

graalpython/com.oracle.graal.python.cext/src/capi.h

@@ -86,6 +86,7 @@ typedef struct {
 
 PyAPI_DATA(PyTypeObject) PyBuffer_Type;
 PyAPI_DATA(PyTypeObject) _PyExc_BaseException;
+PyAPI_DATA(PyTypeObject) _PyExc_StopIteration;
 
 typedef void (*init_upcall)();
 

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

@@ -43,6 +43,7 @@
 #include <pyerrors.h>
 
 PyTypeObject _PyExc_BaseException = PY_TRUFFLE_TYPE("BaseException", &PyType_Type, Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_BASE_EXC_SUBCLASS, sizeof(PyBaseExceptionObject));
+PyTypeObject _PyExc_StopIteration = PY_TRUFFLE_TYPE("StopIteration", &PyType_Type, Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_BASE_EXC_SUBCLASS, sizeof(PyStopIterationObject));
 
 #define PY_EXCEPTION(__EXC_NAME__) (UPCALL_CEXT_O(polyglot_from_string("PyTruffle_Type", SRC_CS), polyglot_from_string(__EXC_NAME__, SRC_CS)))
 

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

@@ -117,6 +117,7 @@
 import com.oracle.graal.python.builtins.objects.common.SequenceStorageNodes;
 import com.oracle.graal.python.builtins.objects.complex.PComplex;
 import com.oracle.graal.python.builtins.objects.dict.PDict;
+import com.oracle.graal.python.builtins.objects.exception.PBaseException;
 import com.oracle.graal.python.builtins.objects.floats.PFloat;
 import com.oracle.graal.python.builtins.objects.frame.PFrame;
 import com.oracle.graal.python.builtins.objects.function.PBuiltinFunction;
@@ -149,6 +150,7 @@
 import com.oracle.graal.python.builtins.objects.type.TypeNodes.GetSuperClassNode;
 import com.oracle.graal.python.builtins.objects.type.TypeNodes.GetTypeFlagsNode;
 import com.oracle.graal.python.lib.PyNumberAsSizeNode;
+import com.oracle.graal.python.lib.PyObjectGetAttr;
 import com.oracle.graal.python.lib.PyObjectSizeNode;
 import com.oracle.graal.python.nodes.ErrorMessages;
 import com.oracle.graal.python.nodes.PGuards;
@@ -1259,22 +1261,38 @@ static Object doPCode(PCode object, PythonNativeWrapper nativeWrapper, String ke
             return doPCodeCached(object, nativeWrapper, key, NativeMember.byName(key), factory, toSulongNode);
         }
 
-        // TODO: fallback guard
-        @Specialization
-        static Object doGeneric(@SuppressWarnings("unused") Object object, DynamicObjectNativeWrapper nativeWrapper, String key,
+        @Specialization(guards = {"eq(VALUE, key)", "isStopIteration(exception, getClassNode, isSubtypeNode)"}, limit = "1")
+        static Object doException(PBaseException exception, @SuppressWarnings("unused") PythonNativeWrapper nativeWrapper, @SuppressWarnings("unused") String key,
+                        @Shared("getClassNode") @SuppressWarnings("unused") @Cached GetClassNode getClassNode,
+                        @SuppressWarnings("unused") @Cached IsSubtypeNode isSubtypeNode,
+                        @Cached PyObjectGetAttr getAttr,
+                        @Shared("toSulongNode") @Cached ToSulongNode toSulongNode) {
+            return toSulongNode.execute(getAttr.execute(null, exception, "value"));
+        }
+
+        protected boolean isStopIteration(PBaseException exception, GetClassNode getClassNode, IsSubtypeNode isSubtypeNode) {
+            return isSubtypeNode.execute(getClassNode.execute(exception), PythonBuiltinClassType.StopIteration);
+        }
+
+        @Fallback
+        static Object doGeneric(@SuppressWarnings("unused") Object object, PythonNativeWrapper nativeWrapper, String key,
                         @CachedLibrary(limit = "1") HashingStorageLibrary lib,
                         @Shared("toSulongNode") @Cached ToSulongNode toSulongNode,
                         @Shared("getNativeNullNode") @Cached GetNativeNullNode getNativeNullNode) throws UnknownIdentifierException {
-            // This is the preliminary generic case: There are native members we know that they
-            // exist but we do currently not represent them. So, store them into a dynamic object
-            // such that native code at least reads the value that was written before.
-            if (nativeWrapper.isMemberReadable(key)) {
-                logGeneric(key);
-                DynamicObjectStorage nativeMemberStore = nativeWrapper.getNativeMemberStore();
-                if (nativeMemberStore != null) {
-                    return lib.getItem(nativeMemberStore, key);
+            if (nativeWrapper instanceof DynamicObjectNativeWrapper) {
+                DynamicObjectNativeWrapper dynamicWrapper = (DynamicObjectNativeWrapper) nativeWrapper;
+                // This is the preliminary generic case: There are native members we know that they
+                // exist but we do currently not represent them. So, store them into a dynamic
+                // object
+                // such that native code at least reads the value that was written before.
+                if (dynamicWrapper.isMemberReadable(key)) {
+                    logGeneric(key);
+                    DynamicObjectStorage nativeMemberStore = dynamicWrapper.getNativeMemberStore();
+                    if (nativeMemberStore != null) {
+                        return lib.getItem(nativeMemberStore, key);
+                    }
+                    return toSulongNode.execute(getNativeNullNode.execute());
                 }
-                return toSulongNode.execute(getNativeNullNode.execute());
             }
             throw UnknownIdentifierException.create(key);
         }

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

@@ -281,7 +281,10 @@ public enum NativeMember {
     CO_NAMES("co_names", OBJECT),
     CO_VARNAMES("co_varnames", OBJECT),
     CO_FREEVARS("co_freevars", OBJECT),
-    CO_CELLVARS("co_cellvars", OBJECT);
+    CO_CELLVARS("co_cellvars", OBJECT),
+
+    // PyStopIterationObject
+    VALUE("value", OBJECT);
 
     private final String memberName;
     private final NativeMemberType type;