Add sq_length wrapper

msimacek · msimacek · commit e0a47b7541b6 · 2022-05-12T14:30:04.000+02:00
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/NativeMember.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/NativeMember.java
@@ -113,6 +113,7 @@ public enum NativeMember {
     SQ_ITEM("sq_item"),
     SQ_REPEAT("sq_repeat"),
     SQ_CONCAT("sq_concat"),
+    SQ_LENGTH("sq_length"),
 
     // PyDictObject
     MA_USED("ma_used", PRIMITIVE),
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/PyProcsWrapper.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/PyProcsWrapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2022, 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
@@ -49,13 +49,19 @@
 import com.oracle.graal.python.builtins.objects.cext.capi.DynamicObjectNativeWrapper.PAsPointerNode;
 import com.oracle.graal.python.builtins.objects.cext.capi.DynamicObjectNativeWrapper.ToPyObjectNode;
 import com.oracle.graal.python.builtins.objects.function.PKeyword;
+import com.oracle.graal.python.lib.PyNumberAsSizeNode;
+import com.oracle.graal.python.lib.PyNumberIndexNode;
+import com.oracle.graal.python.lib.PyObjectSizeNode;
+import com.oracle.graal.python.nodes.PRaiseNode;
 import com.oracle.graal.python.nodes.argument.keywords.ExpandKeywordStarargsNode;
 import com.oracle.graal.python.nodes.argument.positional.ExecutePositionalStarargsNode;
 import com.oracle.graal.python.nodes.argument.positional.PositionalArgumentsNode;
 import com.oracle.graal.python.nodes.call.special.CallBinaryMethodNode;
 import com.oracle.graal.python.nodes.call.special.CallTernaryMethodNode;
+import com.oracle.graal.python.nodes.call.special.CallUnaryMethodNode;
 import com.oracle.graal.python.nodes.call.special.CallVarargsMethodNode;
 import com.oracle.graal.python.nodes.object.IsBuiltinClassProfile;
+import com.oracle.graal.python.nodes.util.CastToJavaIntLossyNode;
 import com.oracle.graal.python.runtime.GilNode;
 import com.oracle.graal.python.runtime.PythonContext;
 import com.oracle.graal.python.runtime.exception.PException;
@@ -337,6 +343,45 @@ protected Object execute(Object[] arguments,
         }
     }
 
+    @ExportLibrary(InteropLibrary.class)
+    static class LenfuncWrapper extends PyProcsWrapper {
+
+        public LenfuncWrapper(Object delegate) {
+            super(delegate);
+        }
+
+        @ExportMessage
+        protected Object execute(Object[] arguments,
+                        @CachedLibrary("this") PythonNativeWrapperLibrary lib,
+                        @Cached CallUnaryMethodNode executeNode,
+                        @Cached ToJavaNode toJavaNode,
+                        @Cached TransformExceptionToNativeNode transformExceptionToNativeNode,
+                        @Cached ToSulongNode nullToSulongNode,
+                        @Cached PyNumberIndexNode indexNode,
+                        @Cached CastToJavaIntLossyNode castLossy,
+                        @Cached PyNumberAsSizeNode asSizeNode,
+                        @Cached PRaiseNode raiseNode,
+                        @Exclusive @Cached GilNode gil) throws ArityException {
+            boolean mustRelease = gil.acquire();
+            try {
+                if (arguments.length != 1) {
+                    CompilerDirectives.transferToInterpreterAndInvalidate();
+                    throw ArityException.create(1, 1, arguments.length);
+                }
+                try {
+                    Object result = executeNode.executeObject(null, lib.getDelegate(this), toJavaNode.execute(arguments[0]));
+                    int len = PyObjectSizeNode.convertAndCheckLen(null, result, indexNode, castLossy, asSizeNode, raiseNode);
+                    return (long) len;
+                } catch (PException e) {
+                    transformExceptionToNativeNode.execute(null, e);
+                    return nullToSulongNode.execute(PythonContext.get(nullToSulongNode).getNativeNull());
+                }
+            } finally {
+                gil.release(mustRelease);
+            }
+        }
+    }
+
     public static GetAttrWrapper createGetAttrWrapper(Object getAttrMethod) {
         return new GetAttrWrapper(getAttrMethod);
     }
@@ -359,4 +404,8 @@ public static TernaryFunctionWrapper createTernaryFunctionWrapper(Object setTern
     public static SsizeargfuncWrapper createSsizeargfuncWrapper(Object ssizeArgMethod, boolean newRef) {
         return new SsizeargfuncWrapper(ssizeArgMethod, newRef);
     }
+
+    public static LenfuncWrapper createLenfuncWrapper(Object lenfuncMethod) {
+        return new LenfuncWrapper(lenfuncMethod);
+    }
 }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/PySequenceMethodsWrapper.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/PySequenceMethodsWrapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2022, 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
@@ -42,9 +42,11 @@
 
 import static com.oracle.graal.python.builtins.objects.cext.capi.NativeMember.SQ_CONCAT;
 import static com.oracle.graal.python.builtins.objects.cext.capi.NativeMember.SQ_ITEM;
+import static com.oracle.graal.python.builtins.objects.cext.capi.NativeMember.SQ_LENGTH;
 import static com.oracle.graal.python.builtins.objects.cext.capi.NativeMember.SQ_REPEAT;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__ADD__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__GETITEM__;
+import static com.oracle.graal.python.nodes.SpecialMethodNames.__LEN__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__MUL__;
 
 import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.ToSulongNode;
@@ -90,7 +92,7 @@ protected boolean hasMembers() {
 
     @ExportMessage
     protected boolean isMemberReadable(String member) {
-        return SQ_REPEAT.getMemberName().equals(member) || SQ_ITEM.getMemberName().equals(member) || SQ_CONCAT.getMemberName().equals(member);
+        return SQ_REPEAT.getMemberName().equals(member) || SQ_ITEM.getMemberName().equals(member) || SQ_CONCAT.getMemberName().equals(member) || SQ_LENGTH.getMemberName().equals(member);
     }
 
     @ExportMessage
@@ -116,6 +118,8 @@ protected Object readMember(String member,
                     return PyProcsWrapper.createSsizeargfuncWrapper(lookup.execute(getPythonClass(lib), __GETITEM__), true);
                 } else if (SQ_CONCAT.getMemberName().equals(member)) {
                     result = toSulongNode.execute(lookup.execute(getPythonClass(lib), __ADD__));
+                } else if (SQ_LENGTH.getMemberName().equals(member)) {
+                    result = PyProcsWrapper.createLenfuncWrapper(lookup.execute(getPythonClass(lib), __LEN__));
                 } else {
                     // TODO extend list
                     throw UnknownIdentifierException.create(member);
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/lib/PyObjectSizeNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/lib/PyObjectSizeNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2022, 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
@@ -171,7 +171,7 @@ static int checkLen(PRaiseNode raiseNode, int len) {
         return len;
     }
 
-    static int convertAndCheckLen(VirtualFrame frame, Object result, PyNumberIndexNode indexNode, CastToJavaIntLossyNode castLossy, PyNumberAsSizeNode asSizeNode, PRaiseNode raiseNode) {
+    public static int convertAndCheckLen(VirtualFrame frame, Object result, PyNumberIndexNode indexNode, CastToJavaIntLossyNode castLossy, PyNumberAsSizeNode asSizeNode, PRaiseNode raiseNode) {
         int len;
         Object index = indexNode.execute(frame, result);
         try {

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.`
	`2`	`+ * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.`
`3`	`3`	`* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.`
`4`	`4`	`*`
`5`	`5`	`* The Universal Permissive License (UPL), Version 1.0`
`@@ -171,7 +171,7 @@ static int checkLen(PRaiseNode raiseNode, int len) {`
`171`	`171`	`return len;`
`172`	`172`	`}`
`173`	`173`
`174`		`- static int convertAndCheckLen(VirtualFrame frame, Object result, PyNumberIndexNode indexNode, CastToJavaIntLossyNode castLossy, PyNumberAsSizeNode asSizeNode, PRaiseNode raiseNode) {`
	`174`	`+ public static int convertAndCheckLen(VirtualFrame frame, Object result, PyNumberIndexNode indexNode, CastToJavaIntLossyNode castLossy, PyNumberAsSizeNode asSizeNode, PRaiseNode raiseNode) {`
`175`	`175`	`int len;`
`176`	`176`	`Object index = indexNode.execute(frame, result);`
`177`	`177`	`try {`