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

Thu May 28 21:40:23 CEST 2015

https://hg.python.org/cpython/rev/ddb402d8f5b9
changeset: 96343:ddb402d8f5b9
parent: 96340:ba9e4df5368c
parent: 96342:ac891c518d4e
user: Benjamin Peterson <benjamin at python.org>
date: Thu May 28 14:40:15 2015 -0500
summary:
 merge 3.5
files:
 Doc/library/dis.rst | 4 ----
 Include/opcode.h | 1 -
 Lib/opcode.py | 1 -
 Python/ceval.c | 15 ---------------
 Python/compile.c | 2 --
 Python/opcode_targets.h | 2 +-
 6 files changed, 1 insertions(+), 24 deletions(-)

diff --git a/Doc/library/dis.rst b/Doc/library/dis.rst
--- a/Doc/library/dis.rst
+++ b/Doc/library/dis.rst
@@ -848,10 +848,6 @@
 Pushes a try block from a try-except clause onto the block stack. *delta*
 points to the finally block.
 
-.. opcode:: STORE_MAP
-
- Store a key and value pair in a dictionary. Pops the key and value while
- leaving the dictionary on the stack.
 
 .. opcode:: LOAD_FAST (var_num)
 
diff --git a/Include/opcode.h b/Include/opcode.h
--- a/Include/opcode.h
+++ b/Include/opcode.h
@@ -32,7 +32,6 @@
 #define GET_AITER 50
 #define GET_ANEXT 51
 #define BEFORE_ASYNC_WITH 52
-#define STORE_MAP 54
 #define INPLACE_ADD 55
 #define INPLACE_SUBTRACT 56
 #define INPLACE_MULTIPLY 57
diff --git a/Lib/opcode.py b/Lib/opcode.py
--- a/Lib/opcode.py
+++ b/Lib/opcode.py
@@ -89,7 +89,6 @@
 def_op('GET_ANEXT', 51)
 def_op('BEFORE_ASYNC_WITH', 52)
 
-def_op('STORE_MAP', 54)
 def_op('INPLACE_ADD', 55)
 def_op('INPLACE_SUBTRACT', 56)
 def_op('INPLACE_MULTIPLY', 57)
diff --git a/Python/ceval.c b/Python/ceval.c
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -2680,21 +2680,6 @@
 DISPATCH();
 }
 
- TARGET(STORE_MAP) {
- PyObject *key = TOP();
- PyObject *value = SECOND();
- PyObject *map = THIRD();
- int err;
- STACKADJ(-2);
- assert(PyDict_CheckExact(map));
- err = PyDict_SetItem(map, key, value);
- Py_DECREF(value);
- Py_DECREF(key);
- if (err != 0)
- goto error;
- DISPATCH();
- }
-
 TARGET(MAP_ADD) {
 PyObject *key = TOP();
 PyObject *value = SECOND();
diff --git a/Python/compile.c b/Python/compile.c
--- a/Python/compile.c
+++ b/Python/compile.c
@@ -903,8 +903,6 @@
 return -1;
 case STORE_SUBSCR:
 return -3;
- case STORE_MAP:
- return -2;
 case DELETE_SUBSCR:
 return -2;
 
diff --git a/Python/opcode_targets.h b/Python/opcode_targets.h
--- a/Python/opcode_targets.h
+++ b/Python/opcode_targets.h
@@ -53,7 +53,7 @@
 &&TARGET_GET_ANEXT,
 &&TARGET_BEFORE_ASYNC_WITH,
 &&_unknown_opcode,
- &&TARGET_STORE_MAP,
+ &&_unknown_opcode,
 &&TARGET_INPLACE_ADD,
 &&TARGET_INPLACE_SUBTRACT,
 &&TARGET_INPLACE_MULTIPLY,
-- 
Repository URL: https://hg.python.org/cpython
