Fix: add proper generic case for reading context member

Author: fangerer

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/hpy/GraalHPyContext.java

@@ -147,14 +147,14 @@
 import com.oracle.graal.python.builtins.objects.cext.hpy.GraalHPyContextFunctions.GraalHPyUnicodeFromString;
 import com.oracle.graal.python.builtins.objects.cext.hpy.GraalHPyContextFunctions.GraalHPyUnicodeFromWchar;
 import com.oracle.graal.python.builtins.objects.cext.hpy.GraalHPyContextFunctions.ReturnType;
+import com.oracle.graal.python.builtins.objects.cext.hpy.GraalHPyNodes.HPyAttachFunctionTypeNode;
 import com.oracle.graal.python.builtins.objects.cext.hpy.GraalHPyNodes.PCallHPyFunction;
 import com.oracle.graal.python.builtins.objects.cext.hpy.GraalHPyNodesFactory.HPyAsPythonObjectNodeGen;
 import com.oracle.graal.python.builtins.objects.cext.hpy.GraalHPyNodesFactory.HPyGetNativeSpacePointerNodeGen;
 import com.oracle.graal.python.builtins.objects.cext.hpy.GraalHPyNodesFactory.HPyRaiseNodeGen;
 import com.oracle.graal.python.builtins.objects.cext.hpy.GraalHPyNodesFactory.HPyTransformExceptionToNativeNodeGen;
 import com.oracle.graal.python.builtins.objects.cext.hpy.GraalHPyNodesFactory.PCallHPyFunctionNodeGen;
 import com.oracle.graal.python.builtins.objects.cext.hpy.HPyExternalFunctionNodes.HPyCheckFunctionResultNode;
-import com.oracle.graal.python.builtins.objects.cext.hpy.GraalHPyNodes.HPyAttachFunctionTypeNode;
 import com.oracle.graal.python.builtins.objects.common.EmptyStorage;
 import com.oracle.graal.python.builtins.objects.common.HashMapStorage;
 import com.oracle.graal.python.builtins.objects.common.HashingStorage;
@@ -1704,12 +1704,17 @@ final Object getMembers(@SuppressWarnings("unused") boolean includeInternal) {
     @ExportMessage
     @ImportStatic(HPyContextMember.class)
     static class IsMemberReadable {
-        @Specialization(guards = "cachedKey.equals(key)")
-        static boolean isMemberReadable(@SuppressWarnings("unused") GraalHPyContext context, @SuppressWarnings("unused") String key,
-                        @Cached(value = "key", allowUncached = true) @SuppressWarnings("unused") String cachedKey,
-                        @Cached(value = "getIndex(key)", allowUncached = true) int cachedIdx) {
+        @Specialization(guards = "cachedKey.equals(key)", limit = "1")
+        static boolean isMemberReadableCached(@SuppressWarnings("unused") GraalHPyContext context, @SuppressWarnings("unused") String key,
+                        @Cached(value = "key") @SuppressWarnings("unused") String cachedKey,
+                        @Cached(value = "getIndex(key)") int cachedIdx) {
             return cachedIdx != -1;
         }
+
+        @Specialization(replaces = "isMemberReadableCached")
+        static boolean isMemberReadable(@SuppressWarnings("unused") GraalHPyContext context, String key) {
+            return HPyContextMember.getIndex(key) != -1;
+        }
     }
 
     @ExportMessage
@@ -1735,10 +1740,10 @@ abstract static class GraalHPyReadMemberNode extends Node {
 
         public abstract Object execute(GraalHPyContext hpyContext, String key);
 
-        @Specialization(guards = "cachedKey.equals(key)")
-        static Object doMember(GraalHPyContext hpyContext, String key,
-                        @Cached(value = "key", allowUncached = true) @SuppressWarnings("unused") String cachedKey,
-                        @Cached(value = "getIndex(key)", allowUncached = true) int cachedIdx) {
+        @Specialization(guards = "cachedKey.equals(key)", limit = "1")
+        static Object doMemberCached(GraalHPyContext hpyContext, String key,
+                        @Cached(value = "key") @SuppressWarnings("unused") String cachedKey,
+                        @Cached(value = "getIndex(key)") int cachedIdx) {
             // TODO(fa) once everything is implemented, remove this check
             if (cachedIdx != -1) {
                 Object value = hpyContext.hpyContextMembers[cachedIdx];
@@ -1749,6 +1754,12 @@ static Object doMember(GraalHPyContext hpyContext, String key,
             CompilerDirectives.transferToInterpreterAndInvalidate();
             throw CompilerDirectives.shouldNotReachHere(String.format("context function %s not yet implemented: ", key));
         }
+
+        @Specialization(replaces = "doMemberCached")
+        static Object doMember(GraalHPyContext hpyContext, String key,
+                        @Cached(value = "key", allowUncached = true) @SuppressWarnings("unused") String cachedKey) {
+            return doMemberCached(hpyContext, key, key, HPyContextMember.getIndex(key));
+        }
     }
 
     @ExportMessage

graalpython/lib-graalpython/modules/hpy/test/test_00_basic.py

@@ -203,7 +203,6 @@ def test_varargs(self):
         """)
         assert mod.f(4, 5) == 45
 
-    @pytest.mark.skip
     def test_builtin_handles(self):
         mod = self.make_module("""
             HPyDef_METH(f, "f", f_impl, HPyFunc_O)