Change codes of new instructions.

python · serhiy-storchaka · Feb 22, 2018 · Jul 23, 2017 · Jul 23, 2017 · Jul 23, 2017
commit f1a478d7cea69a317cd95244a961e63af5668029
diff --git a/Include/opcode.h b/Include/opcode.h
@@ -33,7 +33,7 @@ extern "C" {
 #define GET_AITER                50
 #define GET_ANEXT                51
 #define BEFORE_ASYNC_WITH        52
-#define BEGIN_FINALLY            54
+#define BEGIN_FINALLY            53
 #define INPLACE_ADD              55
 #define INPLACE_SUBTRACT         56
 #define INPLACE_MULTIPLY         57
@@ -126,7 +126,7 @@ extern "C" {
 #define BUILD_TUPLE_UNPACK_WITH_CALL 158
 #define LOAD_METHOD             160
 #define CALL_METHOD             161
-#define CALL_FINALLY            163
+#define CALL_FINALLY            162
 
 /* EXCEPT_HANDLER is a special, implicit block type which is created when
    entering an except handler. It is not an opcode but we define it here

diff --git a/Lib/opcode.py b/Lib/opcode.py
@@ -87,8 +87,8 @@ def jabs_op(name, op):
 def_op('GET_AITER', 50)
 def_op('GET_ANEXT', 51)
 def_op('BEFORE_ASYNC_WITH', 52)
+def_op('BEGIN_FINALLY', 53)
 
-def_op('BEGIN_FINALLY', 54)
 def_op('INPLACE_ADD', 55)
 def_op('INPLACE_SUBTRACT', 56)
 def_op('INPLACE_MULTIPLY', 57)
@@ -211,7 +211,6 @@ def jabs_op(name, op):
 
 name_op('LOAD_METHOD', 160)
 def_op('CALL_METHOD', 161)
-
-def_op('CALL_FINALLY', 163)
+def_op('CALL_FINALLY', 162)
 
 del def_op, name_op, jrel_op, jabs_op
diff --git a/Lib/test/test_dis.py b/Lib/test/test_dis.py
@@ -993,11 +993,11 @@ def jumpy():
   Instruction(opname='CALL_FUNCTION', opcode=131, arg=1, argval=1, argrepr='', offset=156, starts_line=None, is_jump_target=False),
   Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=158, starts_line=None, is_jump_target=False),
   Instruction(opname='POP_BLOCK', opcode=87, arg=None, argval=None, argrepr='', offset=160, starts_line=None, is_jump_target=False),
-  Instruction(opname='BEGIN_FINALLY', opcode=54, arg=None, argval=None, argrepr='', offset=162, starts_line=None, is_jump_target=False),
+  Instruction(opname='BEGIN_FINALLY', opcode=53, arg=None, argval=None, argrepr='', offset=162, starts_line=None, is_jump_target=False),
   Instruction(opname='WITH_CLEANUP_START', opcode=81, arg=None, argval=None, argrepr='', offset=164, starts_line=None, is_jump_target=True),
   Instruction(opname='WITH_CLEANUP_FINISH', opcode=82, arg=None, argval=None, argrepr='', offset=166, starts_line=None, is_jump_target=False),
   Instruction(opname='POP_BLOCK', opcode=87, arg=None, argval=None, argrepr='', offset=168, starts_line=None, is_jump_target=True),
-  Instruction(opname='BEGIN_FINALLY', opcode=54, arg=None, argval=None, argrepr='', offset=170, starts_line=None, is_jump_target=False),
+  Instruction(opname='BEGIN_FINALLY', opcode=53, arg=None, argval=None, argrepr='', offset=170, starts_line=None, is_jump_target=False),
   Instruction(opname='LOAD_GLOBAL', opcode=116, arg=1, argval='print', argrepr='print', offset=172, starts_line=28, is_jump_target=True),
   Instruction(opname='LOAD_CONST', opcode=100, arg=10, argval="OK, now we're done", argrepr='"OK, now we\'re done"', offset=174, starts_line=None, is_jump_target=False),
   Instruction(opname='CALL_FUNCTION', opcode=131, arg=1, argval=1, argrepr='', offset=176, starts_line=None, is_jump_target=False),

diff --git a/Python/importlib.h b/Python/importlib.h
@@ -137,13 +137,13 @@ const unsigned char _Py_M__importlib[] = {
     2,124,1,60,0,122,142,124,0,106,3,143,106,1,0,124,
     0,106,4,100,1,107,2,115,46,124,0,106,5,124,1,107,
     2,114,80,124,1,124,0,95,5,124,0,4,0,106,4,100,
-    2,55,0,2,0,95,4,100,3,87,0,2,0,163,56,87,
-    0,163,82,83,0,124,0,160,6,161,0,114,100,116,7,100,
+    2,55,0,2,0,95,4,100,3,87,0,2,0,162,56,87,
+    0,162,82,83,0,124,0,160,6,161,0,114,100,116,7,100,
     4,124,0,22,0,131,1,130,1,124,0,106,8,160,9,100,
     5,161,1,114,126,124,0,4,0,106,10,100,2,55,0,2,
-    0,95,10,87,0,54,0,81,0,82,0,124,0,106,8,160,
+    0,95,10,87,0,53,0,81,0,82,0,124,0,106,8,160,
     9,161,0,1,0,124,0,106,8,160,11,161,0,1,0,113,
-    18,87,0,54,0,116,2,124,1,61,0,88,0,100,6,83,
+    18,87,0,53,0,116,2,124,1,61,0,88,0,100,6,83,
     0,41,7,122,185,10,32,32,32,32,32,32,32,32,65,99,
     113,117,105,114,101,32,116,104,101,32,109,111,100,117,108,101,
     32,108,111,99,107,46,32,32,73,102,32,97,32,112,111,116,
@@ -176,7 +176,7 @@ const unsigned char _Py_M__importlib[] = {
     124,0,4,0,106,5,100,3,56,0,2,0,95,5,124,0,
     106,5,100,2,107,2,114,108,100,0,124,0,95,3,124,0,
     106,7,114,108,124,0,4,0,106,7,100,3,56,0,2,0,
-    95,7,124,0,106,8,160,9,161,0,1,0,87,0,54,0,
+    95,7,124,0,106,8,160,9,161,0,1,0,87,0,53,0,
     81,0,82,0,100,0,83,0,41,4,78,122,31,99,97,110,
     110,111,116,32,114,101,108,101,97,115,101,32,117,110,45,97,
     99,113,117,105,114,101,100,32,108,111,99,107,114,19,0,0,
@@ -307,7 +307,7 @@ const unsigned char _Py_M__importlib[] = {
     100,1,107,8,114,76,116,5,124,0,131,1,125,1,110,8,
     116,6,124,0,131,1,125,1,124,0,102,1,100,2,100,3,
     132,1,125,2,116,7,160,8,124,1,124,2,161,2,116,2,
-    124,0,60,0,87,0,54,0,116,0,160,9,161,0,1,0,
+    124,0,60,0,87,0,53,0,116,0,160,9,161,0,1,0,
     88,0,124,1,83,0,41,4,122,139,71,101,116,32,111,114,
     32,99,114,101,97,116,101,32,116,104,101,32,109,111,100,117,
     108,101,32,108,111,99,107,32,102,111,114,32,97,32,103,105,
@@ -321,7 +321,7 @@ const unsigned char _Py_M__importlib[] = {
     0,0,0,9,0,0,0,83,0,0,0,115,48,0,0,0,
     116,0,160,1,161,0,1,0,122,24,116,2,160,3,124,1,
     161,1,124,0,107,8,114,30,116,2,124,1,61,0,87,0,
-    54,0,116,0,160,4,161,0,1,0,88,0,100,0,83,0,
+    53,0,116,0,160,4,161,0,1,0,88,0,100,0,83,0,
     41,1,78,41,5,218,4,95,105,109,112,218,12,97,99,113,
     117,105,114,101,95,108,111,99,107,218,13,95,109,111,100,117,
     108,101,95,108,111,99,107,115,114,30,0,0,0,218,12,114,
@@ -554,7 +554,7 @@ const unsigned char _Py_M__importlib[] = {
     106,3,124,2,106,4,61,0,87,0,113,80,4,0,116,5,
     107,10,114,60,1,0,1,0,1,0,89,0,113,80,88,0,
     110,16,116,6,100,3,124,2,106,4,124,2,106,7,131,3,
-    1,0,87,0,54,0,100,4,124,0,106,0,95,8,88,0,
+    1,0,87,0,53,0,100,4,124,0,106,0,95,8,88,0,
     100,0,83,0,41,5,78,99,1,0,0,0,0,0,0,0,
     2,0,0,0,3,0,0,0,115,0,0,0,115,22,0,0,
     0,124,0,93,14,125,1,124,1,100,0,107,9,86,0,1,
@@ -964,11 +964,11 @@ const unsigned char _Py_M__importlib[] = {
     100,2,141,2,130,1,124,0,106,7,100,3,107,8,114,112,
     124,0,106,8,100,3,107,8,114,88,116,6,100,4,124,0,
     106,0,100,2,141,2,130,1,116,9,124,0,124,1,100,5,
-    100,6,141,3,1,0,124,1,87,0,2,0,163,58,83,0,
+    100,6,141,3,1,0,124,1,87,0,2,0,162,58,83,0,
     116,9,124,0,124,1,100,5,100,6,141,3,1,0,116,10,
     124,0,106,7,100,7,131,2,115,152,124,0,106,7,160,11,
     124,2,161,1,1,0,110,12,124,0,106,7,160,12,124,1,
-    161,1,1,0,87,0,54,0,81,0,82,0,116,2,106,3,
+    161,1,1,0,87,0,53,0,81,0,82,0,116,2,106,3,
     124,2,25,0,83,0,41,8,122,70,69,120,101,99,117,116,
     101,32,116,104,101,32,115,112,101,99,39,115,32,115,112,101,
     99,105,102,105,101,100,32,109,111,100,117,108,101,32,105,110,
@@ -1023,7 +1023,7 @@ const unsigned char _Py_M__importlib[] = {
     124,1,131,1,143,54,1,0,124,0,106,0,100,0,107,8,
     114,84,124,0,106,5,100,0,107,8,114,96,116,6,100,2,
     124,0,106,7,100,3,141,2,130,1,110,12,124,0,106,0,
-    160,8,124,1,161,1,1,0,87,0,54,0,81,0,82,0,
+    160,8,124,1,161,1,1,0,87,0,53,0,81,0,82,0,
     116,9,106,10,124,0,106,7,25,0,83,0,41,4,78,114,
     135,0,0,0,122,14,109,105,115,115,105,110,103,32,108,111,
     97,100,101,114,41,1,114,15,0,0,0,41,11,114,93,0,
@@ -1038,7 +1038,7 @@ const unsigned char _Py_M__importlib[] = {
     0,99,1,0,0,0,0,0,0,0,1,0,0,0,9,0,
     0,0,67,0,0,0,115,34,0,0,0,116,0,124,0,106,
     1,131,1,143,16,1,0,116,2,124,0,131,1,87,0,2,
-    0,163,2,83,0,81,0,82,0,100,1,83,0,41,2,122,
+    0,162,2,83,0,81,0,82,0,100,1,83,0,41,2,122,
     191,82,101,116,117,114,110,32,97,32,110,101,119,32,109,111,
     100,117,108,101,32,111,98,106,101,99,116,44,32,108,111,97,
     100,101,100,32,98,121,32,116,104,101,32,115,112,101,99,39,
@@ -1415,8 +1415,8 @@ const unsigned char _Py_M__importlib[] = {
     0,143,78,1,0,122,10,124,5,106,8,125,6,87,0,110,
     48,4,0,116,9,107,10,114,122,1,0,1,0,1,0,116,
     10,124,5,124,0,124,1,131,3,125,7,124,7,100,1,107,
-    8,114,118,89,0,87,0,163,24,113,52,89,0,110,14,88,
-    0,124,6,124,0,124,1,124,2,131,3,125,7,87,0,54,
+    8,114,118,89,0,87,0,162,24,113,52,89,0,110,14,88,
+    0,124,6,124,0,124,1,124,2,131,3,125,7,87,0,53,
     0,81,0,82,0,124,7,100,1,107,9,114,52,124,4,115,
     242,124,0,116,0,106,6,107,6,114,242,116,0,106,6,124,
     0,25,0,125,8,122,10,124,8,106,11,125,9,87,0,110,
@@ -1513,8 +1513,8 @@ const unsigned char _Py_M__importlib[] = {
     0,0,4,0,0,0,11,0,0,0,67,0,0,0,115,98,
     0,0,0,116,0,124,0,131,1,143,44,1,0,116,1,106,
     2,160,3,124,0,116,4,161,2,125,2,124,2,116,4,107,
-    8,114,48,116,5,124,0,124,1,131,2,87,0,2,0,163,
-    6,83,0,87,0,54,0,81,0,82,0,124,2,100,1,107,
+    8,114,48,116,5,124,0,124,1,131,2,87,0,2,0,162,
+    6,83,0,87,0,53,0,81,0,82,0,124,2,100,1,107,
     8,114,86,100,2,160,6,124,0,161,1,125,3,116,7,124,
     3,124,0,100,3,141,2,130,1,116,8,124,0,131,1,1,
     0,124,2,83,0,41,4,122,25,70,105,110,100,32,97,110,
@@ -1576,8 +1576,8 @@ const unsigned char _Py_M__importlib[] = {
     124,6,131,2,1,0,87,0,113,14,4,0,116,10,107,10,
     114,228,1,0,125,7,1,0,122,44,124,7,106,11,124,6,
     107,2,114,210,116,12,106,13,160,14,124,6,116,15,161,2,
-    100,11,107,9,114,210,87,0,89,0,163,10,113,14,130,0,
-    87,0,89,0,54,0,100,11,125,7,126,7,88,0,113,14,
+    100,11,107,9,114,210,87,0,89,0,162,10,113,14,130,0,
+    87,0,89,0,53,0,100,11,125,7,126,7,88,0,113,14,
     88,0,113,14,124,0,83,0,41,12,122,238,70,105,103,117,
     114,101,32,111,117,116,32,119,104,97,116,32,95,95,105,109,
     112,111,114,116,95,95,32,115,104,111,117,108,100,32,114,101,