[Python-checkins] cpython (merge 3.5 -> default): merge 3.5 (#25060)

[benjamin.peterson]

https://hg.python.org/cpython/rev/7d76df6dafde
changeset:   97900:7d76df6dafde
parent:      97898:72736bd18062
parent:      97899:6c1b0dd07340
user:        Benjamin Peterson <benjamin at python.org>
date:        Thu Sep 10 21:11:26 2015 -0700
summary:
  merge 3.5 (#25060)

files:
  Misc/NEWS                   |  2 ++
  Python/compile.c            |  2 +-
  Python/importlib_external.h |  2 +-
  3 files changed, 4 insertions(+), 2 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -103,6 +103,8 @@
 Library
 -------
 
+- Issue #25060: Correctly compute stack usage of the BUILD_MAP opcode.
+
 - Issue #24857: Comparing call_args to a long sequence now correctly returns a
   boolean result instead of raising an exception.  Patch by A Kaptur.
 
diff --git a/Python/compile.c b/Python/compile.c
--- a/Python/compile.c
+++ b/Python/compile.c
@@ -985,7 +985,7 @@
         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:
diff --git a/Python/importlib_external.h b/Python/importlib_external.h
--- a/Python/importlib_external.h
+++ b/Python/importlib_external.h
@@ -1395,7 +1395,7 @@
     32,83,111,117,114,99,101,76,111,97,100,101,114,32,117,115,
     105,110,103,32,116,104,101,32,102,105,108,101,32,115,121,115,
     116,101,109,46,99,2,0,0,0,0,0,0,0,3,0,0,
-    0,5,0,0,0,67,0,0,0,115,34,0,0,0,116,0,
+    0,4,0,0,0,67,0,0,0,115,34,0,0,0,116,0,
     0,124,1,0,131,1,0,125,2,0,100,1,0,124,2,0,
     106,1,0,100,2,0,124,2,0,106,2,0,105,2,0,83,
     41,3,122,33,82,101,116,117,114,110,32,116,104,101,32,109,

-- 
Repository URL: https://hg.python.org/cpython