HPy: fix HPyType_GetName for types with module in the name

Author: steve-s

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

@@ -289,6 +289,22 @@ def test_slots(self):
         assert tester.year == 1, "year was %s "% tester.year
         assert tester.is_binary_compatible()
 
+    def test_tp_name(self):
+        TestTpName = CPyExtType("TestTpName",
+                                '''
+                                static PyObject* testslots_tp_name(PyObject* self, PyObject *cls) {
+                                    return PyUnicode_FromString(((PyTypeObject*)cls)->tp_name);
+                                }
+                                ''',
+                                tp_methods='{"get_tp_name", (PyCFunction)testslots_tp_name, METH_O, ""}',
+                                )
+        tester = TestTpName()
+        class MyClass:
+            pass
+        assert tester.get_tp_name(MyClass) == 'MyClass'
+        assert tester.get_tp_name(int) == 'int'
+        assert tester.get_tp_name(type(tester)) == 'TestTpName.TestTpName'
+
     def test_slots_initialized(self):
         TestSlotsInitialized = CPyExtType("TestSlotsInitialized", 
                               '''

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

@@ -3336,6 +3336,8 @@ Object execute(Object[] arguments,
                         @Cached HPyAsContextNode asContextNode,
                         @Cached HPyAsPythonObjectNode asType,
                         @Cached GetNameNode getName,
+                        @Cached ReadAttributeFromObjectNode readHPyFlagsNode,
+                        @Cached ReadAttributeFromObjectNode readModuleNameNode,
                         @Cached EncodeNativeStringNode encodeNativeStringNode,
                         @Cached GilNode gil) throws ArityException {
             checkArity(arguments, 2);
@@ -3344,6 +3346,15 @@ Object execute(Object[] arguments,
                 GraalHPyContext context = asContextNode.execute(arguments[0]);
                 Object type = asType.execute(context, arguments[1]);
                 String name = getName.execute(type);
+                if (readHPyFlagsNode.execute(type, GraalHPyDef.TYPE_HPY_FLAGS) != PNone.NO_VALUE) {
+                    // Types that originated from HPy: although they are ordinary managed
+                    // PythonClasses, the name should have "cext semantics", i.e., contain the
+                    // module if it was specified in the HPyType_Spec
+                    Object moduleName = readModuleNameNode.execute(type, SpecialAttributeNames.__MODULE__);
+                    if (moduleName instanceof String) {
+                        name = moduleName + "." + name;
+                    }
+                }
                 byte[] result = encodeNativeStringNode.execute(StandardCharsets.UTF_8, name, CodecsModuleBuiltins.STRICT);
                 return new CByteArrayWrapper(result);
             } finally {