From ef05eab432625dd6a2e62055ea7723d64bed593e Mon Sep 17 00:00:00 2001
From: Dmitry Stogov <dmitry@zend.com>
Date: Thu, 4 Jul 2019 17:25:43 +0300
Subject: Improve zend_binary_assign_op helpers. Reorder opcode numbers to make
 ADD-POW and ASSIGN_ADD-ASSIGN_POW opcodes sequencional.

---
 Zend/zend_vm_opcodes.c | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

(limited to 'Zend/zend_vm_opcodes.c')

diff --git a/Zend/zend_vm_opcodes.c b/Zend/zend_vm_opcodes.c
index b1c754f6d3..2d4cbd3c1e 100644
--- a/Zend/zend_vm_opcodes.c
+++ b/Zend/zend_vm_opcodes.c
@@ -35,6 +35,7 @@ static const char *zend_vm_opcodes_names[209] = {
 	"ZEND_BW_OR",
 	"ZEND_BW_AND",
 	"ZEND_BW_XOR",
+	"ZEND_POW",
 	"ZEND_BW_NOT",
 	"ZEND_BOOL_NOT",
 	"ZEND_BOOL_XOR",
@@ -44,8 +45,6 @@ static const char *zend_vm_opcodes_names[209] = {
 	"ZEND_IS_NOT_EQUAL",
 	"ZEND_IS_SMALLER",
 	"ZEND_IS_SMALLER_OR_EQUAL",
-	"ZEND_CAST",
-	"ZEND_QM_ASSIGN",
 	"ZEND_ASSIGN_ADD",
 	"ZEND_ASSIGN_SUB",
 	"ZEND_ASSIGN_MUL",
@@ -57,6 +56,7 @@ static const char *zend_vm_opcodes_names[209] = {
 	"ZEND_ASSIGN_BW_OR",
 	"ZEND_ASSIGN_BW_AND",
 	"ZEND_ASSIGN_BW_XOR",
+	"ZEND_ASSIGN_POW",
 	"ZEND_PRE_INC",
 	"ZEND_PRE_DEC",
 	"ZEND_POST_INC",
@@ -64,7 +64,7 @@ static const char *zend_vm_opcodes_names[209] = {
 	"ZEND_ASSIGN",
 	"ZEND_ASSIGN_REF",
 	"ZEND_ECHO",
-	"ZEND_GENERATOR_CREATE",
+	"ZEND_QM_ASSIGN",
 	"ZEND_JMP",
 	"ZEND_JMPZ",
 	"ZEND_JMPNZ",
@@ -74,7 +74,7 @@ static const char *zend_vm_opcodes_names[209] = {
 	"ZEND_CASE",
 	"ZEND_CHECK_VAR",
 	"ZEND_SEND_VAR_NO_REF_EX",
-	"ZEND_MAKE_REF",
+	"ZEND_CAST",
 	"ZEND_BOOL",
 	"ZEND_FAST_CONCAT",
 	"ZEND_ROPE_INIT",
@@ -162,12 +162,12 @@ static const char *zend_vm_opcodes_names[209] = {
 	"ZEND_ASSIGN_OBJ",
 	"ZEND_OP_DATA",
 	"ZEND_INSTANCEOF",
-	"ZEND_DECLARE_CLASS",
-	NULL,
+	"ZEND_GENERATOR_CREATE",
+	"ZEND_MAKE_REF",
 	"ZEND_DECLARE_FUNCTION",
 	"ZEND_YIELD_FROM",
 	"ZEND_DECLARE_CONST",
-	NULL,
+	"ZEND_DECLARE_CLASS",
 	"ZEND_DECLARE_CLASS_DELAYED",
 	NULL,
 	"ZEND_ASSIGN_DIM",
@@ -189,8 +189,8 @@ static const char *zend_vm_opcodes_names[209] = {
 	"ZEND_FAST_RET",
 	"ZEND_RECV_VARIADIC",
 	"ZEND_SEND_UNPACK",
-	"ZEND_POW",
-	"ZEND_ASSIGN_POW",
+	NULL,
+	NULL,
 	"ZEND_BIND_GLOBAL",
 	"ZEND_COALESCE",
 	"ZEND_SPACESHIP",
@@ -247,6 +247,7 @@ static uint32_t zend_vm_opcodes_flags[209] = {
 	0x80000707,
 	0x80000707,
 	0x80000707,
+	0x00000707,
 	0x00000007,
 	0x00000007,
 	0x80000707,
@@ -256,8 +257,7 @@ static uint32_t zend_vm_opcodes_flags[209] = {
 	0x80000707,
 	0x00000707,
 	0x00000707,
-	0x07000003,
-	0x00000003,
+	0x04046753,
 	0x04046753,
 	0x04046753,
 	0x04046753,
@@ -276,7 +276,7 @@ static uint32_t zend_vm_opcodes_flags[209] = {
 	0x00000301,
 	0x0b000101,
 	0x00000007,
-	0x00000000,
+	0x00000003,
 	0x00000020,
 	0x00002007,
 	0x00002007,
@@ -286,7 +286,7 @@ static uint32_t zend_vm_opcodes_flags[209] = {
 	0x00000705,
 	0x00000101,
 	0x00001001,
-	0x00000101,
+	0x07000003,
 	0x00000007,
 	0x00000707,
 	0x01000701,
@@ -374,12 +374,12 @@ static uint32_t zend_vm_opcodes_flags[209] = {
 	0x00040751,
 	0x00000000,
 	0x00047305,
-	0x00000003,
 	0x00000000,
+	0x00000101,
 	0x00000000,
 	0x00000003,
 	0x00000303,
-	0x00000000,
+	0x00000003,
 	0x00000303,
 	0x00000000,
 	0x00006701,
@@ -401,8 +401,8 @@ static uint32_t zend_vm_opcodes_flags[209] = {
 	0x00003000,
 	0x0000a110,
 	0x00000000,
-	0x00000707,
-	0x04046753,
+	0x00000000,
+	0x00000000,
 	0x00040301,
 	0x00002007,
 	0x00000707,
-- 
cgit v1.2.1