[GR-23263] Make test_subclassinit pass

PullRequest: graalpython/1174

Author: msimacek

graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_subclassinit.txt

@@ -8,8 +8,10 @@
 *graalpython.lib-python.3.test.test_subclassinit.Test.test_init_subclass_skipped
 *graalpython.lib-python.3.test.test_subclassinit.Test.test_init_subclass_wrong
 *graalpython.lib-python.3.test.test_subclassinit.Test.test_set_name
+*graalpython.lib-python.3.test.test_subclassinit.Test.test_set_name_error
 *graalpython.lib-python.3.test.test_subclassinit.Test.test_set_name_init_subclass
 *graalpython.lib-python.3.test.test_subclassinit.Test.test_set_name_lookup
 *graalpython.lib-python.3.test.test_subclassinit.Test.test_set_name_metaclass
 *graalpython.lib-python.3.test.test_subclassinit.Test.test_set_name_modifying_dict
+*graalpython.lib-python.3.test.test_subclassinit.Test.test_set_name_wrong
 *graalpython.lib-python.3.test.test_subclassinit.Test.test_type

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

@@ -60,6 +60,7 @@
 import static com.oracle.graal.python.nodes.BuiltinNames.TYPE;
 import static com.oracle.graal.python.nodes.BuiltinNames.ZIP;
 import static com.oracle.graal.python.nodes.ErrorMessages.ARG_MUST_NOT_BE_ZERO;
+import static com.oracle.graal.python.nodes.ErrorMessages.ERROR_CALLING_SET_NAME;
 import static com.oracle.graal.python.nodes.PGuards.isInteger;
 import static com.oracle.graal.python.nodes.PGuards.isNoValue;
 import static com.oracle.graal.python.nodes.SpecialAttributeNames.__BASICSIZE__;
@@ -2318,7 +2319,11 @@ Object typeNew(VirtualFrame frame, Object cls, Object wName, PTuple bases, PDict
                 for (DictEntry entry : nslib.entries(namespace.getDictStorage())) {
                     Object setName = getSetNameNode.execute(entry.value);
                     if (setName != PNone.NO_VALUE) {
-                        callSetNameNode.execute(frame, setName, entry.value, newType, entry.key);
+                        try {
+                            callSetNameNode.execute(frame, setName, entry.value, newType, entry.key);
+                        } catch (PException e) {
+                            throw raise(RuntimeError, e.getEscapedException(), ERROR_CALLING_SET_NAME, entry.value, entry.key, newType);
+                        }
                     }
                 }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/ErrorMessages.java

@@ -195,6 +195,7 @@ public abstract class ErrorMessages {
     public static final String ERROR57_SOCKET_CANNOT_BE_CONNECTED = "[Errno 57] Socket is not connected";
     public static final String ERROR_5_WHILE_DECOMPRESSING = "Error -5 while decompressing data: incomplete or truncated stream";
     public static final String ERROR_WRITING_FORKEXEC = "there was an error writing the fork_exec error to the error pipe";
+    public static final String ERROR_CALLING_SET_NAME = "Error calling __set_name__ on '%p' instance '%s' in '%N'";
     public static final String ESTAR_FORMAT_SPECIFIERS_NOT_ALLOWED = "'e*' format specifiers are not supported";
     public static final String EXCEPTION_CAUSE_MUST_BE_NONE_OR_DERIVE_FROM_BASE_EX = "exception cause must be None or derive from BaseException";
     public static final String EXCEPTION_CAUSES_MUST_DERIVE_FROM_BASE_EX = "exception causes must derive from BaseException";