Align builtin sq_length/mp_length slots definitions with CPython

steve-s · steve-s · commit 1c4ee9a2d68a · 2024-04-10T17:19:40.000+02:00
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ctypes/PyCArrayBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ctypes/PyCArrayBuiltins.java
@@ -338,6 +338,7 @@ static Object Array_item(VirtualFrame frame, CDataObject self, Object item,
     }
 
     @Slot(SlotKind.sq_length)
+    @Slot(SlotKind.mp_length)
     @GenerateUncached
     @GenerateNodeFactory
     abstract static class LenNode extends LenBuiltinNode {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/array/ArrayBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/array/ArrayBuiltins.java
@@ -743,6 +743,7 @@ static Object getitem(PArray self,
     }
 
     @Slot(SlotKind.sq_length)
+    @Slot(SlotKind.mp_length)
     @GenerateUncached
     @GenerateNodeFactory
     abstract static class LenNode extends LenBuiltinNode {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/contextvars/ContextBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/contextvars/ContextBuiltins.java
@@ -85,7 +85,7 @@ protected List<? extends NodeFactory<? extends PythonBuiltinBaseNode>> getNodeFa
         return ContextBuiltinsFactory.getFactories();
     }
 
-    @Slot(SlotKind.sq_length)
+    @Slot(SlotKind.mp_length)
     @GenerateUncached
     @GenerateNodeFactory
     public abstract static class LenNode extends LenBuiltinNode {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/dict/DictBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/dict/DictBuiltins.java
@@ -391,7 +391,6 @@ static boolean run(VirtualFrame frame, PDict self, Object key,
         }
     }
 
-    @Slot(SlotKind.sq_length)
     @Slot(SlotKind.mp_length)
     @GenerateUncached
     @GenerateNodeFactory
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/foreign/ForeignObjectBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/foreign/ForeignObjectBuiltins.java
@@ -239,6 +239,7 @@ static Object[] unpackForeignArray(Object left, InteropLibrary lib, PForeignToPT
     }
 
     @Slot(SlotKind.sq_length)
+    @Slot(SlotKind.mp_length)
     @GenerateUncached
     @GenerateNodeFactory
     abstract static class LenNode extends LenBuiltinNode {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/mappingproxy/MappingproxyBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/mappingproxy/MappingproxyBuiltins.java
@@ -196,7 +196,6 @@ Object run(VirtualFrame frame, PMappingproxy self, Object key,
         }
     }
 
-    @Slot(SlotKind.sq_length)
     @Slot(SlotKind.mp_length)
     @GenerateUncached
     @GenerateNodeFactory
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/mmap/MMapBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/mmap/MMapBuiltins.java
@@ -279,6 +279,7 @@ protected static CastToByteNode createCoerce() {
     }
 
     @Slot(SlotKind.sq_length)
+    @Slot(SlotKind.mp_length)
     @GenerateUncached
     @GenerateNodeFactory
     public abstract static class LenNode extends LenBuiltinNode {

Original file line number	Diff line number	Diff line change
`@@ -338,6 +338,7 @@ static Object Array_item(VirtualFrame frame, CDataObject self, Object item,`
`338`	`338`	`}`
`339`	`339`
`340`	`340`	`@Slot(SlotKind.sq_length)`
	`341`	`+ @Slot(SlotKind.mp_length)`
`341`	`342`	`@GenerateUncached`
`342`	`343`	`@GenerateNodeFactory`
`343`	`344`	`abstract static class LenNode extends LenBuiltinNode {`
Original file line number	Diff line number	Diff line change
`@@ -743,6 +743,7 @@ static Object getitem(PArray self,`
`743`	`743`	`}`
`744`	`744`
`745`	`745`	`@Slot(SlotKind.sq_length)`
	`746`	`+ @Slot(SlotKind.mp_length)`
`746`	`747`	`@GenerateUncached`
`747`	`748`	`@GenerateNodeFactory`
`748`	`749`	`abstract static class LenNode extends LenBuiltinNode {`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ protected List<? extends NodeFactory<? extends PythonBuiltinBaseNode>> getNodeFa`
`85`	`85`	`return ContextBuiltinsFactory.getFactories();`
`86`	`86`	`}`
`87`	`87`
`88`		`- @Slot(SlotKind.sq_length)`
	`88`	`+ @Slot(SlotKind.mp_length)`
`89`	`89`	`@GenerateUncached`
`90`	`90`	`@GenerateNodeFactory`
`91`	`91`	`public abstract static class LenNode extends LenBuiltinNode {`
Original file line number	Diff line number	Diff line change
`@@ -391,7 +391,6 @@ static boolean run(VirtualFrame frame, PDict self, Object key,`
`391`	`391`	`}`
`392`	`392`	`}`
`393`	`393`
`394`		`- @Slot(SlotKind.sq_length)`
`395`	`394`	`@Slot(SlotKind.mp_length)`
`396`	`395`	`@GenerateUncached`
`397`	`396`	`@GenerateNodeFactory`
Original file line number	Diff line number	Diff line change
`@@ -239,6 +239,7 @@ static Object[] unpackForeignArray(Object left, InteropLibrary lib, PForeignToPT`
`239`	`239`	`}`
`240`	`240`
`241`	`241`	`@Slot(SlotKind.sq_length)`
	`242`	`+ @Slot(SlotKind.mp_length)`
`242`	`243`	`@GenerateUncached`
`243`	`244`	`@GenerateNodeFactory`
`244`	`245`	`abstract static class LenNode extends LenBuiltinNode {`
Original file line number	Diff line number	Diff line change
`@@ -196,7 +196,6 @@ Object run(VirtualFrame frame, PMappingproxy self, Object key,`
`196`	`196`	`}`
`197`	`197`	`}`
`198`	`198`
`199`		`- @Slot(SlotKind.sq_length)`
`200`	`199`	`@Slot(SlotKind.mp_length)`
`201`	`200`	`@GenerateUncached`
`202`	`201`	`@GenerateNodeFactory`
Original file line number	Diff line number	Diff line change
`@@ -279,6 +279,7 @@ protected static CastToByteNode createCoerce() {`
`279`	`279`	`}`
`280`	`280`
`281`	`281`	`@Slot(SlotKind.sq_length)`
	`282`	`+ @Slot(SlotKind.mp_length)`
`282`	`283`	`@GenerateUncached`
`283`	`284`	`@GenerateNodeFactory`
`284`	`285`	`public abstract static class LenNode extends LenBuiltinNode {`