simplify LenNode and its users

Author: timfel

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/BuiltinFunctions.java

@@ -65,7 +65,6 @@
 import static com.oracle.graal.python.nodes.HiddenAttributes.ID_KEY;
 import static com.oracle.graal.python.nodes.SpecialAttributeNames.__NAME__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__INSTANCECHECK__;
-import static com.oracle.graal.python.nodes.SpecialMethodNames.__LEN__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__NEXT__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__SUBCLASSCHECK__;
 import static com.oracle.graal.python.runtime.exception.PythonErrorType.OverflowError;
@@ -142,7 +141,6 @@
 import com.oracle.graal.python.nodes.call.special.LookupAndCallBinaryNode;
 import com.oracle.graal.python.nodes.call.special.LookupAndCallTernaryNode;
 import com.oracle.graal.python.nodes.call.special.LookupAndCallUnaryNode;
-import com.oracle.graal.python.nodes.call.special.LookupAndCallUnaryNode.NoAttributeHandler;
 import com.oracle.graal.python.nodes.classes.IsSubtypeNode;
 import com.oracle.graal.python.nodes.control.GetIteratorExpressionNode.GetIteratorNode;
 import com.oracle.graal.python.nodes.control.GetNextNode;
@@ -1206,30 +1204,10 @@ public Object iter(Object callable, Object sentinel) {
     @Builtin(name = LEN, minNumOfPositionalArgs = 1)
     @GenerateNodeFactory
     public abstract static class LenNode extends PythonUnaryBuiltinNode {
-
-        private static final Supplier<NoAttributeHandler> NO_LEN = () -> new NoAttributeHandler() {
-            @Child private PRaiseNode raiseNode;
-
-            @Override
-            public Object execute(Object receiver) {
-                if (raiseNode == null) {
-                    CompilerDirectives.transferToInterpreterAndInvalidate();
-                    raiseNode = insert(PRaiseNode.create());
-                }
-                throw raiseNode.raise(TypeError, "object of type '%p' has no len()", receiver);
-            }
-        };
-
-        public abstract Object executeWith(VirtualFrame frame, Object object);
-
-        protected static LookupAndCallUnaryNode createLen() {
-            return LookupAndCallUnaryNode.create(__LEN__, NO_LEN);
-        }
-
-        @Specialization
-        public Object len(VirtualFrame frame, Object obj,
-                        @Cached("createLen()") LookupAndCallUnaryNode dispatch) {
-            return dispatch.executeObject(frame, obj);
+        @Specialization(limit = "getCallSiteInlineCacheMaxDepth()")
+        public int len(VirtualFrame frame, Object obj,
+                        @CachedLibrary("obj") PythonObjectLibrary lib) {
+            return lib.lengthWithState(obj, PArguments.getThreadState(frame));
         }
     }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/LZMAModuleBuiltins.java

@@ -173,7 +173,6 @@ abstract static class LZMANode extends PythonBuiltinNode {
 
         @Child private GetItemNode getItemNode;
         @Child private PythonObjectLibrary castToLongNode;
-        @Child private BuiltinFunctions.LenNode lenNode;
         @CompilationFinal private IsBuiltinClassProfile keyErrorProfile;
 
         @TruffleBoundary
@@ -195,7 +194,7 @@ protected static LZMA2Options parseLZMAOptions(int preset) {
 
         // corresponds to 'parse_filter_chain_spec' in '_lzmamodule.c'
         protected FilterOptions[] parseFilterChainSpec(VirtualFrame frame, Object filters, PythonObjectLibrary library) {
-            int n = len(frame, filters);
+            int n = library.lengthWithState(filters, PArguments.getThreadState(frame));
             FilterOptions[] optionsChain = new FilterOptions[n];
             for (int i = 0; i < n; i++) {
                 optionsChain[i] = convertLZMAFilter(frame, getItem(frame, filters, i), library);
@@ -285,14 +284,6 @@ private int asInt(VirtualFrame frame, Object obj) {
             return castToLongNode.asSizeWithState(obj, PArguments.getThreadState(frame));
         }
 
-        private int len(VirtualFrame frame, Object obj) {
-            if (lenNode == null) {
-                CompilerDirectives.transferToInterpreterAndInvalidate();
-                lenNode = insert(BuiltinFunctionsFactory.LenNodeFactory.create());
-            }
-            return asInt(frame, lenNode.execute(frame, obj));
-        }
-
         protected static boolean isNoneOrNoValue(Object obj) {
             return PGuards.isNone(obj) || PGuards.isNoValue(obj);
         }
@@ -419,7 +410,6 @@ private static LZMAOutputStream createLZMAOutputStream(ByteArrayOutputStream bos
     abstract static class LZMADecompressorNode extends LZMANode {
 
         @Child private GetItemNode getItemNode;
-        @Child private BuiltinFunctions.LenNode lenNode;
 
         @CompilationFinal private IsBuiltinClassProfile keyErrorProfile;