Merge branch 'PHP-7.4'

* PHP-7.4:
  Replace ZEND_ASSIGN_ADD (and others) by ZEND_ASSIGN_OP, ZEND_ASSIGN_DIM_OP, ZEND_ASSGIN_OBJ_OP and ZEND_ASSIGN_STATIC_PROP_OP

1 files changed, 55 insertions, 83 deletions

diff --git a/Zend/zend_vm_opcodes.c b/Zend/zend_vm_opcodes.c
index 2d4cbd3c1e..3603448523 100644
--- a/Zend/zend_vm_opcodes.c
+++ b/Zend/zend_vm_opcodes.c
@@ -22,7 +22,7 @@
 #include <zend.h>
 #include <zend_vm_opcodes.h>
 
-static const char *zend_vm_opcodes_names[209] = {
+static const char *zend_vm_opcodes_names[195] = {
 	"ZEND_NOP",
 	"ZEND_ADD",
 	"ZEND_SUB",
@@ -45,26 +45,26 @@ static const char *zend_vm_opcodes_names[209] = {
 	"ZEND_IS_NOT_EQUAL",
 	"ZEND_IS_SMALLER",
 	"ZEND_IS_SMALLER_OR_EQUAL",
-	"ZEND_ASSIGN_ADD",
-	"ZEND_ASSIGN_SUB",
-	"ZEND_ASSIGN_MUL",
-	"ZEND_ASSIGN_DIV",
-	"ZEND_ASSIGN_MOD",
-	"ZEND_ASSIGN_SL",
-	"ZEND_ASSIGN_SR",
-	"ZEND_ASSIGN_CONCAT",
-	"ZEND_ASSIGN_BW_OR",
-	"ZEND_ASSIGN_BW_AND",
-	"ZEND_ASSIGN_BW_XOR",
-	"ZEND_ASSIGN_POW",
+	"ZEND_ASSIGN",
+	"ZEND_ASSIGN_DIM",
+	"ZEND_ASSIGN_OBJ",
+	"ZEND_ASSIGN_STATIC_PROP",
+	"ZEND_ASSIGN_OP",
+	"ZEND_ASSIGN_DIM_OP",
+	"ZEND_ASSIGN_OBJ_OP",
+	"ZEND_ASSIGN_STATIC_PROP_OP",
+	"ZEND_ASSIGN_REF",
+	"ZEND_QM_ASSIGN",
+	"ZEND_ASSIGN_OBJ_REF",
+	"ZEND_ASSIGN_STATIC_PROP_REF",
 	"ZEND_PRE_INC",
 	"ZEND_PRE_DEC",
 	"ZEND_POST_INC",
 	"ZEND_POST_DEC",
-	"ZEND_ASSIGN",
-	"ZEND_ASSIGN_REF",
-	"ZEND_ECHO",
-	"ZEND_QM_ASSIGN",
+	"ZEND_PRE_INC_STATIC_PROP",
+	"ZEND_PRE_DEC_STATIC_PROP",
+	"ZEND_POST_INC_STATIC_PROP",
+	"ZEND_POST_DEC_STATIC_PROP",
 	"ZEND_JMP",
 	"ZEND_JMPZ",
 	"ZEND_JMPNZ",
@@ -159,26 +159,26 @@ static const char *zend_vm_opcodes_names[209] = {
 	"ZEND_PRE_DEC_OBJ",
 	"ZEND_POST_INC_OBJ",
 	"ZEND_POST_DEC_OBJ",
-	"ZEND_ASSIGN_OBJ",
+	"ZEND_ECHO",
 	"ZEND_OP_DATA",
 	"ZEND_INSTANCEOF",
 	"ZEND_GENERATOR_CREATE",
 	"ZEND_MAKE_REF",
 	"ZEND_DECLARE_FUNCTION",
-	"ZEND_YIELD_FROM",
+	"ZEND_DECLARE_LAMBDA_FUNCTION",
 	"ZEND_DECLARE_CONST",
 	"ZEND_DECLARE_CLASS",
 	"ZEND_DECLARE_CLASS_DELAYED",
-	NULL,
-	"ZEND_ASSIGN_DIM",
+	"ZEND_DECLARE_ANON_CLASS",
+	"ZEND_ADD_ARRAY_UNPACK",
 	"ZEND_ISSET_ISEMPTY_PROP_OBJ",
 	"ZEND_HANDLE_EXCEPTION",
 	"ZEND_USER_OPCODE",
 	"ZEND_ASSERT_CHECK",
 	"ZEND_JMP_SET",
-	"ZEND_DECLARE_LAMBDA_FUNCTION",
-	NULL,
-	NULL,
+	"ZEND_UNSET_CV",
+	"ZEND_ISSET_ISEMPTY_CV",
+	"ZEND_FETCH_LIST_W",
 	"ZEND_SEPARATE",
 	"ZEND_FETCH_CLASS_NAME",
 	"ZEND_CALL_TRAMPOLINE",
@@ -189,13 +189,13 @@ static const char *zend_vm_opcodes_names[209] = {
 	"ZEND_FAST_RET",
 	"ZEND_RECV_VARIADIC",
 	"ZEND_SEND_UNPACK",
-	NULL,
-	NULL,
+	"ZEND_YIELD_FROM",
+	"ZEND_COPY_TMP",
 	"ZEND_BIND_GLOBAL",
 	"ZEND_COALESCE",
 	"ZEND_SPACESHIP",
-	"ZEND_DECLARE_ANON_CLASS",
-	NULL,
+	"ZEND_FUNC_NUM_ARGS",
+	"ZEND_FUNC_GET_ARGS",
 	"ZEND_FETCH_STATIC_PROP_R",
 	"ZEND_FETCH_STATIC_PROP_W",
 	"ZEND_FETCH_STATIC_PROP_RW",
@@ -217,24 +217,10 @@ static const char *zend_vm_opcodes_names[209] = {
 	"ZEND_GET_CLASS",
 	"ZEND_GET_CALLED_CLASS",
 	"ZEND_GET_TYPE",
-	"ZEND_FUNC_NUM_ARGS",
-	"ZEND_FUNC_GET_ARGS",
-	"ZEND_UNSET_CV",
-	"ZEND_ISSET_ISEMPTY_CV",
-	"ZEND_FETCH_LIST_W",
 	"ZEND_ARRAY_KEY_EXISTS",
-	"ZEND_PRE_INC_STATIC_PROP",
-	"ZEND_PRE_DEC_STATIC_PROP",
-	"ZEND_POST_INC_STATIC_PROP",
-	"ZEND_POST_DEC_STATIC_PROP",
-	"ZEND_ASSIGN_OBJ_REF",
-	"ZEND_ASSIGN_STATIC_PROP",
-	"ZEND_ASSIGN_STATIC_PROP_REF",
-	"ZEND_COPY_TMP",
-	"ZEND_ADD_ARRAY_UNPACK",
 };
 
-static uint32_t zend_vm_opcodes_flags[209] = {
+static uint32_t zend_vm_opcodes_flags[195] = {
 	0x00000000,
 	0x00000707,
 	0x00000707,
@@ -257,26 +243,26 @@ static uint32_t zend_vm_opcodes_flags[209] = {
 	0x80000707,
 	0x00000707,
 	0x00000707,
-	0x04046753,
-	0x04046753,
-	0x04046753,
-	0x04046753,
-	0x04046753,
-	0x04046753,
-	0x04046753,
-	0x04046753,
-	0x04046753,
-	0x04046753,
-	0x04046753,
-	0x04046753,
+	0x00000301,
+	0x00006701,
+	0x00040751,
+	0x00040000,
+	0x04000701,
+	0x04005701,
+	0x04000751,
+	0x04000000,
+	0x0b000101,
+	0x00000003,
+	0x0b040751,
+	0x0b040000,
 	0x00000001,
 	0x00000001,
 	0x00000001,
 	0x00000001,
-	0x00000301,
-	0x0b000101,
-	0x00000007,
-	0x00000003,
+	0x00040000,
+	0x00040000,
+	0x00040000,
+	0x00040000,
 	0x00000020,
 	0x00002007,
 	0x00002007,
@@ -371,26 +357,26 @@ static uint32_t zend_vm_opcodes_flags[209] = {
 	0x00040751,
 	0x00040751,
 	0x00040751,
-	0x00040751,
+	0x00000007,
 	0x00000000,
 	0x00047305,
 	0x00000000,
 	0x00000101,
 	0x00000000,
-	0x00000003,
+	0x00000103,
 	0x00000303,
 	0x00000003,
 	0x00000303,
+	0x03000000,
 	0x00000000,
-	0x00006701,
 	0x00060757,
 	0x00000000,
 	0x00000000,
 	0x00002000,
 	0x00002003,
-	0x00000103,
-	0x00000000,
-	0x00000000,
+	0x00000101,
+	0x00020101,
+	0x00000701,
 	0x00000101,
 	0x00000071,
 	0x00000000,
@@ -401,13 +387,13 @@ static uint32_t zend_vm_opcodes_flags[209] = {
 	0x00003000,
 	0x0000a110,
 	0x00000000,
-	0x00000000,
-	0x00000000,
+	0x00000003,
+	0x00000105,
 	0x00040301,
 	0x00002007,
 	0x00000707,
-	0x03000000,
-	0x00000000,
+	0x00000101,
+	0x00000103,
 	0x00047000,
 	0x00647000,
 	0x00047000,
@@ -429,21 +415,7 @@ static uint32_t zend_vm_opcodes_flags[209] = {
 	0x00000103,
 	0x00000101,
 	0x00000103,
-	0x00000101,
-	0x00000103,
-	0x00000101,
-	0x00020101,
-	0x00000701,
 	0x00000707,
-	0x00040000,
-	0x00040000,
-	0x00040000,
-	0x00040000,
-	0x0b040751,
-	0x00040000,
-	0x0b040000,
-	0x00000105,
-	0x00000000,
 };
 
 ZEND_API const char* ZEND_FASTCALL zend_get_opcode_name(zend_uchar opcode) {