Use a "yield" parameter instead of a "discard" parameter.

Author: ZeroIntensity

Python/codegen.c

@@ -4561,20 +4561,18 @@ codegen_comprehension_generator(compiler *c, location loc,
 }
 
 static int
-codegen_unpack_starred(compiler *c, location loc, expr_ty value, bool discard)
+codegen_unpack_starred(compiler *c, location loc, expr_ty value, bool yield)
 {
     NEW_JUMP_TARGET_LABEL(c, unpack_start);
     NEW_JUMP_TARGET_LABEL(c, unpack_end);
     VISIT(c, expr, value);
     ADDOP_I(c, loc, GET_ITER, 0);
     USE_LABEL(c, unpack_start);
     ADDOP_JUMP(c, loc, FOR_ITER, unpack_end);
-    if (discard) {
-        ADDOP(c, loc, POP_TOP);
-    } else {
+    if (yield) {
         ADDOP_YIELD(c, loc);
-        ADDOP(c, loc, POP_TOP);
     }
+    ADDOP(c, loc, POP_TOP);
     ADDOP_JUMP(c, NO_LOCATION, JUMP, unpack_start);
     USE_LABEL(c, unpack_end);
     ADDOP(c, NO_LOCATION, END_FOR);
@@ -4667,7 +4665,7 @@ codegen_sync_comprehension_generator(compiler *c, location loc,
         case COMP_GENEXP:
             assert(!avoid_creation);
             if (elt->kind == Starred_kind) {
-                RETURN_IF_ERROR(codegen_unpack_starred(c, elt_loc, elt->v.Starred.value, /*discard=*/false));
+                RETURN_IF_ERROR(codegen_unpack_starred(c, elt_loc, elt->v.Starred.value, /*yield=*/true));
             }
             else {
                 VISIT(c, expr, elt);
@@ -4678,7 +4676,7 @@ codegen_sync_comprehension_generator(compiler *c, location loc,
         case COMP_LISTCOMP:
             if (avoid_creation) {
                 if (elt->kind == Starred_kind) {
-                    RETURN_IF_ERROR(codegen_unpack_starred(c, elt_loc, elt->v.Starred.value, /*discard=*/true));
+                    RETURN_IF_ERROR(codegen_unpack_starred(c, elt_loc, elt->v.Starred.value, /*yield=*/false));
                 } else {
                     VISIT(c, expr, elt);
                     ADDOP(c, elt_loc, POP_TOP);
@@ -4831,7 +4829,7 @@ codegen_async_comprehension_generator(compiler *c, location loc,
         case COMP_LISTCOMP:
             if (avoid_creation) {
                 if (elt->kind == Starred_kind) {
-                    RETURN_IF_ERROR(codegen_unpack_starred(c, elt_loc, elt->v.Starred.value, /*discard=*/false));
+                    RETURN_IF_ERROR(codegen_unpack_starred(c, elt_loc, elt->v.Starred.value, /*yield=*/false));
                 } else {
                     VISIT(c, expr, elt);
                     ADDOP(c, elt_loc, POP_TOP);