HPy tests for JNI fast paths in Get/SetItem_x

Author: steve-s

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

@@ -1761,8 +1761,9 @@ public final int ctxSetItems(long receiverHandle, String name, long valueHandle)
             HPyRaiseNode.raiseIntUncached(this, -1, SystemError, ErrorMessages.HPY_UNEXPECTED_HPY_NULL);
             return -1;
         }
+        TruffleString tsName = toTruffleStringUncached(name);
         try (UncachedAcquire gil = GilNode.uncachedAcquire()) {
-            PyObjectSetItem.getUncached().execute(null, receiver, name, value);
+            PyObjectSetItem.getUncached().execute(null, receiver, tsName, value);
             return 0;
         } catch (PException e) {
             HPyTransformExceptionToNativeNode.executeUncached(this, e);

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

@@ -29,6 +29,8 @@
 to be able to use e.g. pytest.raises (which on PyPy will be implemented by a
 "fake pytest module")
 """
+import math
+
 from .support import HPyTest
 
 
@@ -339,6 +341,12 @@ def foo(self, value):
         mod.f(b)
         assert b.foo is True
 
+    def check_subscript_type_error(self, fun):
+        import pytest
+        for obj in [42, 3.14, None]:
+            with pytest.raises(TypeError):
+                fun(obj)
+
     def test_getitem(self):
         import pytest
         mod = self.make_module("""
@@ -359,6 +367,9 @@ def test_getitem(self):
             @INIT
         """)
         assert mod.f({3: "hello"}) == "hello"
+        assert mod.f({3: 42}) == 42
+        assert mod.f({3: 0.5}) == 0.5
+        assert math.isnan(mod.f({3: math.nan}))
         with pytest.raises(KeyError) as exc:
             mod.f({1: "bad"})
         assert exc.value.args == (3,)
@@ -367,6 +378,8 @@ def test_getitem(self):
         with pytest.raises(IndexError):
             mod.f([])
 
+        self.check_subscript_type_error(mod.f)
+
     def test_getitem_i(self):
         import pytest
         mod = self.make_module("""
@@ -383,6 +396,9 @@ def test_getitem_i(self):
             @INIT
         """)
         assert mod.f({3: "hello"}) == "hello"
+        assert mod.f({3: 42}) == 42
+        assert mod.f({3: 0.5}) == 0.5
+        assert math.isnan(mod.f({3: math.nan}))
         with pytest.raises(KeyError) as exc:
             mod.f({1: "bad"})
         assert exc.value.args == (3,)
@@ -391,6 +407,8 @@ def test_getitem_i(self):
         with pytest.raises(IndexError):
             mod.f([])
 
+        self.check_subscript_type_error(mod.f)
+
     def test_getitem_s(self):
         import pytest
         mod = self.make_module("""
@@ -407,13 +425,18 @@ def test_getitem_s(self):
             @INIT
         """)
         assert mod.f({"limes": "hello"}) == "hello"
+        assert mod.f({"limes": 42}) == 42
+        assert mod.f({"limes": 0.5}) == 0.5
+        assert math.isnan(mod.f({"limes": math.nan}))
         with pytest.raises(KeyError) as exc:
             mod.f({"oranges": "bad"})
         assert exc.value.args == ("limes",)
 
         with pytest.raises(TypeError):
             mod.f([])
 
+        self.check_subscript_type_error(mod.f)
+
     def test_setitem(self):
         import pytest
         mod = self.make_module("""
@@ -442,6 +465,9 @@ def test_setitem(self):
         with pytest.raises(IndexError):
             mod.f([])
 
+        self.check_subscript_type_error(mod.f)
+
+
     def test_setitem_i(self):
         import pytest
         mod = self.make_module("""
@@ -465,6 +491,8 @@ def test_setitem_i(self):
         with pytest.raises(IndexError):
             mod.f([])
 
+        self.check_subscript_type_error(mod.f)
+
     def test_setitem_s(self):
         import pytest
         mod = self.make_module("""
@@ -487,6 +515,8 @@ def test_setitem_s(self):
         with pytest.raises(TypeError):
             mod.f([])
 
+        self.check_subscript_type_error(mod.f)
+
     def test_length(self):
         mod = self.make_module("""
             HPyDef_METH(f, "f", f_impl, HPyFunc_O)