Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

compute stack effect of BUILD_MAP correctly (closes #25060)

This commit is contained in:
Benjamin Peterson 2015-09-10 21:02:39 -07:00
parent 508a81e094
commit b685515039
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Misc/NEWS
View File

@ -14,6 +14,8 @@ Core and Builtins
Library 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 - Issue #24857: Comparing call_args to a long sequence now correctly returns a
boolean result instead of raising an exception. Patch by A Kaptur. boolean result instead of raising an exception. Patch by A Kaptur.

2
Python/compile.c
View File

@ -985,7 +985,7 @@ PyCompile_OpcodeStackEffect(int opcode, int oparg)
case BUILD_MAP_UNPACK_WITH_CALL: case BUILD_MAP_UNPACK_WITH_CALL:
return 1 - (oparg & 0xFF); return 1 - (oparg & 0xFF);
case BUILD_MAP: case BUILD_MAP:
return 1; return 1 - 2*oparg;
case LOAD_ATTR: case LOAD_ATTR:
return 0; return 0;
case COMPARE_OP: case COMPARE_OP:

2
Python/importlib_external.h
View File

@ -1395,7 +1395,7 @@ const unsigned char _Py_M__importlib_external[] = {
32,83,111,117,114,99,101,76,111,97,100,101,114,32,117,115, 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, 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, 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, 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, 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, 41,3,122,33,82,101,116,117,114,110,32,116,104,101,32,109,