Fix argument checking for type.__new__

Author: msimacek

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

@@ -14,6 +14,7 @@
 *graalpython.lib-python.3.test.test_types.ClassCreationTests.test_new_class_with_mro_entry_multiple
 *graalpython.lib-python.3.test.test_types.ClassCreationTests.test_new_class_with_mro_entry_multiple_2
 *graalpython.lib-python.3.test.test_types.ClassCreationTests.test_new_class_with_mro_entry_none
+*graalpython.lib-python.3.test.test_types.ClassCreationTests.test_one_argument_type
 *graalpython.lib-python.3.test.test_types.ClassCreationTests.test_prepare_class
 *graalpython.lib-python.3.test.test_types.ClassCreationTests.test_resolve_bases
 *graalpython.lib-python.3.test.test_types.CoroutineTests.test_duck_coro

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

@@ -61,6 +61,7 @@
 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.ErrorMessages.TAKES_EXACTLY_D_ARGUMENTS_D_GIVEN;
 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__;
@@ -2135,9 +2136,14 @@ public abstract static class TypeNode extends PythonBuiltinNode {
 
         @Specialization(guards = {"isNoValue(bases)", "isNoValue(dict)"})
         @SuppressWarnings("unused")
-        static Object type(Object cls, Object obj, PNone bases, PNone dict, PKeyword[] kwds,
+        Object type(Object cls, Object obj, PNone bases, PNone dict, PKeyword[] kwds,
+                        @Cached IsBuiltinClassProfile profile,
                         @Cached GetClassNode getClass) {
-            return getClass.execute(obj);
+            if (profile.profileClass(cls, PythonBuiltinClassType.PythonClass)) {
+                return getClass.execute(obj);
+            } else {
+                throw raise(TypeError, TAKES_EXACTLY_D_ARGUMENTS_D_GIVEN, "type.__new__", 3, 1);
+            }
         }
 
         @Specialization(guards = "isString(wName)")

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

@@ -473,6 +473,7 @@ public abstract class ErrorMessages {
     public static final String TAKES_D_POS_ARG_S_BUT_GIVEN_S = "%s() takes %d positional argument%s but %d %s given%s";
     public static final String TAKES_FROM_D_TO_D_POS_ARG_S_BUT_D_POS_ARG_S = "%s() takes from %d to %d positional argument%s but %d positional argument%s (and %d keyword-only argument%s) were given%s";
     public static final String TAKES_FROM_D_TO_D_POS_ARG_S_BUT_D_S_GIVEN_S = "%s() takes from %d to %d positional argument%s but %d %s given%s";
+    public static final String TAKES_EXACTLY_D_ARGUMENTS_D_GIVEN = "%s() takes exactly %d arguments (%d given)";
     public static final String TAKES_NO_KEYWORD_ARGS = "%s takes no keyword arguments";
     public static final String THROW_THIRD_ARG_MUST_BE_TRACEBACK = "throw() third argument must be a traceback object";
     public static final String TIMEOUT_VALUE_MUST_BE_POSITIVE = "timeout value must be positive";