Issue python#28823: Simplified compiling with opcode BUILD_MAP_UNPACK.

serhiy-storchaka · serhiy-storchaka · commit 3d85fae91f82 · 2016-11-28T20:56:37.000+02:00
diff --git a/Python/compile.c b/Python/compile.c
@@ -3344,11 +3344,8 @@ compiler_dict(struct compiler *c, expr_ty e)
     /* If there is more than one dict, they need to be merged into a new
      * dict.  If there is one dict and it's an unpacking, then it needs
      * to be copied into a new dict." */
-    while (containers > 1 || is_unpacking) {
-        int oparg = containers < 255 ? containers : 255;
-        ADDOP_I(c, BUILD_MAP_UNPACK, oparg);
-        containers -= (oparg - 1);
-        is_unpacking = 0;
+    if (containers > 1 || is_unpacking) {
+        ADDOP_I(c, BUILD_MAP_UNPACK, containers);
     }
     return 1;
 }

Original file line number	Diff line number	Diff line change
`@@ -3344,11 +3344,8 @@ compiler_dict(struct compiler *c, expr_ty e)`
`3344`	`3344`	`/* If there is more than one dict, they need to be merged into a new`
`3345`	`3345`	`* dict. If there is one dict and it's an unpacking, then it needs`
`3346`	`3346`	`* to be copied into a new dict." */`
`3347`		`- while (containers > 1 \|\| is_unpacking) {`
`3348`		`- int oparg = containers < 255 ? containers : 255;`
`3349`		`- ADDOP_I(c, BUILD_MAP_UNPACK, oparg);`
`3350`		`- containers -= (oparg - 1);`
`3351`		`- is_unpacking = 0;`
	`3347`	`+ if (containers > 1 \|\| is_unpacking) {`
	`3348`	`+ ADDOP_I(c, BUILD_MAP_UNPACK, containers);`
`3352`	`3349`	`}`
`3353`	`3350`	`return 1;`
`3354`	`3351`	`}`