[GR-48262] Filter out hidden keys

PullRequest: graalpython/2935

Author: qunaibit

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

@@ -305,6 +305,9 @@ def test_inheret_numbers_slots(self):
         assert X.B_has_add_slot()
         assert Y.E_has_add_slot()
 
+        # check dir & __dir__
+        assert sorted(list(B.__dir__())) == dir(B)
+
     def test_managed_class_with_native_base(self):
         NativeModule = CPyExtType("NativeModule_", 
                             '''

graalpython/com.oracle.graal.python.test/src/tests/test_object.py

@@ -104,6 +104,8 @@ def __init__(self):
     assert "d" in m.__dict__
     assert m.__dict__ == {'a': 10, 'd': 20}
 
+    # check dir & __dir__
+    assert sorted(list(m.__dir__())) == dir(m)
 
 def test_set_attr_builtins():
     lst = list()

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/type/SpecialMethodSlot.java

@@ -40,7 +40,6 @@
  */
 package com.oracle.graal.python.builtins.objects.type;
 
-import static com.oracle.graal.python.builtins.objects.cext.structs.CFields.PyTypeObject__tp_dict;
 import static com.oracle.graal.python.builtins.objects.type.MethodsFlags.NB_ADD;
 import static com.oracle.graal.python.builtins.objects.type.MethodsFlags.NB_AND;
 import static com.oracle.graal.python.builtins.objects.type.MethodsFlags.NB_BOOL;
@@ -151,11 +150,10 @@
 import com.oracle.graal.python.builtins.Python3Core;
 import com.oracle.graal.python.builtins.PythonBuiltinClassType;
 import com.oracle.graal.python.builtins.objects.PNone;
+import com.oracle.graal.python.builtins.objects.cext.PythonAbstractNativeObject;
 import com.oracle.graal.python.builtins.objects.cext.PythonNativeClass;
-import com.oracle.graal.python.builtins.objects.cext.structs.CStructAccess;
 import com.oracle.graal.python.builtins.objects.common.HashingStorage;
 import com.oracle.graal.python.builtins.objects.common.HashingStorageNodes.HashingStorageGetItem;
-import com.oracle.graal.python.builtins.objects.common.HashingStorageNodes.HashingStorageSetItem;
 import com.oracle.graal.python.builtins.objects.dict.PDict;
 import com.oracle.graal.python.builtins.objects.function.BuiltinMethodDescriptor;
 import com.oracle.graal.python.builtins.objects.function.PBuiltinFunction;
@@ -627,8 +625,9 @@ private static void setMethodsFlag(PythonNativeClass cls, long flag, PythonConte
             if (assumption != null && assumption.getAssumption().isValid()) {
                 assumption.invalidate("methods flags have changed after class creation");
             }
-            PDict dict = (PDict) CStructAccess.ReadObjectNode.getUncached().readFromObj(cls, PyTypeObject__tp_dict);
-            dict.setDictStorage(HashingStorageSetItem.executeUncached(dict.getDictStorage(), METHODS_FLAGS, flags | flag));
+            if (cls instanceof PythonAbstractNativeObject nclass) {
+                DynamicObjectLibrary.getUncached().putLong(nclass, METHODS_FLAGS, flags | flag);
+            }
         }
     }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/lib/GetMethodsFlagsNode.java

@@ -40,28 +40,24 @@
  */
 package com.oracle.graal.python.lib;
 
-import static com.oracle.graal.python.builtins.objects.cext.structs.CFields.PyTypeObject__tp_dict;
-
 import com.oracle.graal.python.builtins.PythonBuiltinClassType;
 import com.oracle.graal.python.builtins.objects.cext.PythonAbstractNativeObject;
 import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.PCallCapiFunction;
 import com.oracle.graal.python.builtins.objects.cext.capi.NativeCAPISymbol;
-import com.oracle.graal.python.builtins.objects.cext.structs.CStructAccess;
-import com.oracle.graal.python.builtins.objects.cext.structs.CStructAccessFactory;
-import com.oracle.graal.python.builtins.objects.common.HashingStorageNodes.HashingStorageGetItem;
-import com.oracle.graal.python.builtins.objects.common.HashingStorageNodes.HashingStorageSetItem;
-import com.oracle.graal.python.builtins.objects.common.HashingStorageNodesFactory.HashingStorageGetItemNodeGen;
-import com.oracle.graal.python.builtins.objects.dict.PDict;
 import com.oracle.graal.python.builtins.objects.type.PythonManagedClass;
 import com.oracle.graal.python.runtime.PythonContext;
 import com.oracle.truffle.api.Assumption;
+import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Fallback;
 import com.oracle.truffle.api.dsl.GenerateInline;
 import com.oracle.truffle.api.dsl.GenerateUncached;
 import com.oracle.truffle.api.dsl.Specialization;
+import com.oracle.truffle.api.library.CachedLibrary;
 import com.oracle.truffle.api.nodes.Node;
+import com.oracle.truffle.api.nodes.UnexpectedResultException;
+import com.oracle.truffle.api.object.DynamicObjectLibrary;
 import com.oracle.truffle.api.object.HiddenKey;
 
 /**
@@ -87,14 +83,14 @@ protected static long pythonclasstype(PythonBuiltinClassType cls) {
     public static final HiddenKey METHODS_FLAGS = new HiddenKey("__methods_flags__");
 
     @TruffleBoundary
-    private static long populateMethodsFlags(PythonAbstractNativeObject cls, PDict dict) {
+    private static long populateMethodsFlags(PythonAbstractNativeObject cls, DynamicObjectLibrary dynlib) {
         Long flags = (Long) PCallCapiFunction.getUncached().call(NativeCAPISymbol.FUN_GET_METHODS_FLAGS, cls.getPtr());
-        dict.setDictStorage(HashingStorageSetItem.executeUncached(dict.getDictStorage(), METHODS_FLAGS, flags));
+        dynlib.putLong(cls, METHODS_FLAGS, flags);
         return flags;
     }
 
     protected static long getMethodsFlags(PythonAbstractNativeObject cls) {
-        return doNative(null, cls, CStructAccessFactory.ReadObjectNodeGen.getUncached(), HashingStorageGetItemNodeGen.getUncached());
+        return doNative(cls, DynamicObjectLibrary.getUncached());
     }
 
     // The assumption should hold unless `PyType_Modified` is called.
@@ -110,16 +106,17 @@ static long doNativeCached(@SuppressWarnings("unused") PythonAbstractNativeObjec
     }
 
     @Specialization(replaces = "doNativeCached")
-    static long doNative(Node inliningTarget, PythonAbstractNativeObject cls,
-                    @Cached(inline = false) CStructAccess.ReadObjectNode getTpDictNode,
-                    @Cached HashingStorageGetItem getItem) {
+    static long doNative(PythonAbstractNativeObject cls,
+                    @CachedLibrary(limit = "1") DynamicObjectLibrary dynlib) {
         // classes must have tp_dict since they are set during PyType_Ready
-        PDict dict = (PDict) getTpDictNode.readFromObj(cls, PyTypeObject__tp_dict);
-        Object f = getItem.execute(inliningTarget, dict.getDictStorage(), METHODS_FLAGS);
-        if (f == null) {
-            return populateMethodsFlags(cls, dict);
+        if (!dynlib.containsKey(cls, METHODS_FLAGS)) {
+            return populateMethodsFlags(cls, dynlib);
+        }
+        try {
+            return dynlib.getLongOrDefault(cls, METHODS_FLAGS, 0L);
+        } catch (UnexpectedResultException e) {
+            throw CompilerDirectives.shouldNotReachHere(e);
         }
-        return (Long) f;
     }
 
     @Fallback

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/ObjectSequenceStorage.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2022, Oracle and/or its affiliates.
+ * Copyright (c) 2017, 2023, Oracle and/or its affiliates.
  * Copyright (c) 2013, Regents of the University of California
  *
  * All rights reserved.
@@ -176,6 +176,7 @@ public Object getCopyOfInternalArrayObject() {
     @Override
     public void setInternalArrayObject(Object arrayObject) {
         this.values = (Object[]) arrayObject;
+        this.capacity = values.length;
         assertContainsNoJavaString(values);
     }