compiler_visit_kwonlydefaults returns SUCCESS/ERROR

iritkatriel · iritkatriel · commit 9d936351c23e · 2022-12-04T18:47:19.000Z
diff --git a/Python/compile.c b/Python/compile.c
@@ -2480,7 +2480,7 @@ compiler_visit_kwonlydefaults(struct compiler *c, location loc,
 {
     /* Push a dict of keyword-only default values.
 
-       Return 0 on error, -1 if no dict pushed, 1 if a dict is pushed.
+       Return -1 on error, 0 if no dict pushed, 1 if a dict is pushed.
        */
     int i;
     PyObject *keys = NULL;
@@ -2497,7 +2497,7 @@ compiler_visit_kwonlydefaults(struct compiler *c, location loc,
                 keys = PyList_New(1);
                 if (keys == NULL) {
                     Py_DECREF(mangled);
-                    return 0;
+                    return ERROR;
                 }
                 PyList_SET_ITEM(keys, 0, mangled);
             }
@@ -2523,12 +2523,12 @@ compiler_visit_kwonlydefaults(struct compiler *c, location loc,
         return 1;
     }
     else {
-        return -1;
+        return 0;
     }
 
 error:
     Py_XDECREF(keys);
-    return 0;
+    return ERROR;
 }
 
 static int
@@ -2653,8 +2653,8 @@ compiler_default_arguments(struct compiler *c, location loc,
         int res = compiler_visit_kwonlydefaults(c, loc,
                                                 args->kwonlyargs,
                                                 args->kw_defaults);
-        if (res == 0) {
-            return -1;
+        if (res < 0) {
+            return ERROR;
         }
         else if (res > 0) {
             funcflags |= 0x02;

Original file line number	Diff line number	Diff line change
`@@ -2480,7 +2480,7 @@ compiler_visit_kwonlydefaults(struct compiler *c, location loc,`
`2480`	`2480`	`{`
`2481`	`2481`	`/* Push a dict of keyword-only default values.`
`2482`	`2482`
`2483`		`- Return 0 on error, -1 if no dict pushed, 1 if a dict is pushed.`
	`2483`	`+ Return -1 on error, 0 if no dict pushed, 1 if a dict is pushed.`
`2484`	`2484`	`*/`
`2485`	`2485`	`int i;`
`2486`	`2486`	`PyObject *keys = NULL;`
`@@ -2497,7 +2497,7 @@ compiler_visit_kwonlydefaults(struct compiler *c, location loc,`
`2497`	`2497`	`keys = PyList_New(1);`
`2498`	`2498`	`if (keys == NULL) {`
`2499`	`2499`	`Py_DECREF(mangled);`
`2500`		`- return 0;`
	`2500`	`+ return ERROR;`
`2501`	`2501`	`}`
`2502`	`2502`	`PyList_SET_ITEM(keys, 0, mangled);`
`2503`	`2503`	`}`
`@@ -2523,12 +2523,12 @@ compiler_visit_kwonlydefaults(struct compiler *c, location loc,`
`2523`	`2523`	`return 1;`
`2524`	`2524`	`}`
`2525`	`2525`	`else {`
`2526`		`- return -1;`
	`2526`	`+ return 0;`
`2527`	`2527`	`}`
`2528`	`2528`
`2529`	`2529`	`error:`
`2530`	`2530`	`Py_XDECREF(keys);`
`2531`		`- return 0;`
	`2531`	`+ return ERROR;`
`2532`	`2532`	`}`
`2533`	`2533`
`2534`	`2534`	`static int`
`@@ -2653,8 +2653,8 @@ compiler_default_arguments(struct compiler *c, location loc,`
`2653`	`2653`	`int res = compiler_visit_kwonlydefaults(c, loc,`
`2654`	`2654`	`args->kwonlyargs,`
`2655`	`2655`	`args->kw_defaults);`
`2656`		`- if (res == 0) {`
`2657`		`- return -1;`
	`2656`	`+ if (res < 0) {`
	`2657`	`+ return ERROR;`
`2658`	`2658`	`}`
`2659`	`2659`	`else if (res > 0) {`
`2660`	`2660`	`funcflags \|= 0x02;`