merge 3.5 (#25060)

2015-09-10 21:11:26 -07:00
parent 4b55a9300a b685515039
commit 7920b7063d
3 changed files with 4 additions and 2 deletions
--- a/Python/compile.c
+++ b/Python/compile.c
@@ -985,7 +985,7 @@ PyCompile_OpcodeStackEffect(int opcode, int oparg)
        case BUILD_MAP_UNPACK_WITH_CALL:
            return 1 - (oparg & 0xFF);
        case BUILD_MAP:
-            return 1;
+            return 1 - 2*oparg;
        case LOAD_ATTR:
            return 0;
        case COMPARE_OP: