merge 3.5

Doc/library/dis.rst

@@ -848,10 +848,6 @@ the more significant byte last.
    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)
 

Include/opcode.h

@@ -32,7 +32,6 @@ extern "C" {
 #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

Lib/opcode.py

@@ -89,7 +89,6 @@ def_op('GET_AITER', 50)
 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)

Python/ceval.c

@@ -2680,21 +2680,6 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)
             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();

Python/compile.c

@@ -903,8 +903,6 @@ PyCompile_OpcodeStackEffect(int opcode, int oparg)
             return -1;
         case STORE_SUBSCR:
             return -3;
-        case STORE_MAP:
-            return -2;
         case DELETE_SUBSCR:
             return -2;
 

Python/opcode_targets.h

@@ -53,7 +53,7 @@ static void *opcode_targets[256] = {
     &&TARGET_GET_ANEXT,
     &&TARGET_BEFORE_ASYNC_WITH,
     &&_unknown_opcode,
-    &&TARGET_STORE_MAP,
+    &&_unknown_opcode,
     &&TARGET_INPLACE_ADD,
     &&TARGET_INPLACE_SUBTRACT,
     &&TARGET_INPLACE_MULTIPLY,