Skip to content

Commit 3f3651a

Browse files
dstogovdstogov
committed
opcode 137 is used for ZEND_OP_DATA and con't be reused for ZEND_ASSERT_CHECK
1 parent ca8ecab commit 3f3651a

File tree

4 files changed

+54
-54
lines changed

4 files changed

+54
-54
lines changed

‎Zend/zend_vm_def.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6839,7 +6839,7 @@ ZEND_VM_HANDLER(122, ZEND_DEFINED, CONST, ANY)
68396839
ZEND_VM_NEXT_OPCODE();
68406840
}
68416841

6842-
ZEND_VM_HANDLER(137, ZEND_ASSERT_CHECK, ANY, ANY)
6842+
ZEND_VM_HANDLER(151, ZEND_ASSERT_CHECK, ANY, ANY)
68436843
{
68446844
USE_OPLINE
68456845

‎Zend/zend_vm_execute.h

Lines changed: 50 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -40885,31 +40885,31 @@ void zend_init_opcodes_handlers(void)
4088540885
ZEND_ASSIGN_OBJ_SPEC_CV_TMPVAR_HANDLER,
4088640886
ZEND_NULL_HANDLER,
4088740887
ZEND_ASSIGN_OBJ_SPEC_CV_CV_HANDLER,
40888-
ZEND_ASSERT_CHECK_SPEC_HANDLER,
40889-
ZEND_ASSERT_CHECK_SPEC_HANDLER,
40890-
ZEND_ASSERT_CHECK_SPEC_HANDLER,
40891-
ZEND_ASSERT_CHECK_SPEC_HANDLER,
40892-
ZEND_ASSERT_CHECK_SPEC_HANDLER,
40893-
ZEND_ASSERT_CHECK_SPEC_HANDLER,
40894-
ZEND_ASSERT_CHECK_SPEC_HANDLER,
40895-
ZEND_ASSERT_CHECK_SPEC_HANDLER,
40896-
ZEND_ASSERT_CHECK_SPEC_HANDLER,
40897-
ZEND_ASSERT_CHECK_SPEC_HANDLER,
40898-
ZEND_ASSERT_CHECK_SPEC_HANDLER,
40899-
ZEND_ASSERT_CHECK_SPEC_HANDLER,
40900-
ZEND_ASSERT_CHECK_SPEC_HANDLER,
40901-
ZEND_ASSERT_CHECK_SPEC_HANDLER,
40902-
ZEND_ASSERT_CHECK_SPEC_HANDLER,
40903-
ZEND_ASSERT_CHECK_SPEC_HANDLER,
40904-
ZEND_ASSERT_CHECK_SPEC_HANDLER,
40905-
ZEND_ASSERT_CHECK_SPEC_HANDLER,
40906-
ZEND_ASSERT_CHECK_SPEC_HANDLER,
40907-
ZEND_ASSERT_CHECK_SPEC_HANDLER,
40908-
ZEND_ASSERT_CHECK_SPEC_HANDLER,
40909-
ZEND_ASSERT_CHECK_SPEC_HANDLER,
40910-
ZEND_ASSERT_CHECK_SPEC_HANDLER,
40911-
ZEND_ASSERT_CHECK_SPEC_HANDLER,
40912-
ZEND_ASSERT_CHECK_SPEC_HANDLER,
40888+
ZEND_NULL_HANDLER,
40889+
ZEND_NULL_HANDLER,
40890+
ZEND_NULL_HANDLER,
40891+
ZEND_NULL_HANDLER,
40892+
ZEND_NULL_HANDLER,
40893+
ZEND_NULL_HANDLER,
40894+
ZEND_NULL_HANDLER,
40895+
ZEND_NULL_HANDLER,
40896+
ZEND_NULL_HANDLER,
40897+
ZEND_NULL_HANDLER,
40898+
ZEND_NULL_HANDLER,
40899+
ZEND_NULL_HANDLER,
40900+
ZEND_NULL_HANDLER,
40901+
ZEND_NULL_HANDLER,
40902+
ZEND_NULL_HANDLER,
40903+
ZEND_NULL_HANDLER,
40904+
ZEND_NULL_HANDLER,
40905+
ZEND_NULL_HANDLER,
40906+
ZEND_NULL_HANDLER,
40907+
ZEND_NULL_HANDLER,
40908+
ZEND_NULL_HANDLER,
40909+
ZEND_NULL_HANDLER,
40910+
ZEND_NULL_HANDLER,
40911+
ZEND_NULL_HANDLER,
40912+
ZEND_NULL_HANDLER,
4091340913
ZEND_NULL_HANDLER,
4091440914
ZEND_NULL_HANDLER,
4091540915
ZEND_NULL_HANDLER,
@@ -41235,31 +41235,31 @@ void zend_init_opcodes_handlers(void)
4123541235
ZEND_USER_OPCODE_SPEC_HANDLER,
4123641236
ZEND_USER_OPCODE_SPEC_HANDLER,
4123741237
ZEND_USER_OPCODE_SPEC_HANDLER,
41238-
ZEND_NULL_HANDLER,
41239-
ZEND_NULL_HANDLER,
41240-
ZEND_NULL_HANDLER,
41241-
ZEND_NULL_HANDLER,
41242-
ZEND_NULL_HANDLER,
41243-
ZEND_NULL_HANDLER,
41244-
ZEND_NULL_HANDLER,
41245-
ZEND_NULL_HANDLER,
41246-
ZEND_NULL_HANDLER,
41247-
ZEND_NULL_HANDLER,
41248-
ZEND_NULL_HANDLER,
41249-
ZEND_NULL_HANDLER,
41250-
ZEND_NULL_HANDLER,
41251-
ZEND_NULL_HANDLER,
41252-
ZEND_NULL_HANDLER,
41253-
ZEND_NULL_HANDLER,
41254-
ZEND_NULL_HANDLER,
41255-
ZEND_NULL_HANDLER,
41256-
ZEND_NULL_HANDLER,
41257-
ZEND_NULL_HANDLER,
41258-
ZEND_NULL_HANDLER,
41259-
ZEND_NULL_HANDLER,
41260-
ZEND_NULL_HANDLER,
41261-
ZEND_NULL_HANDLER,
41262-
ZEND_NULL_HANDLER,
41238+
ZEND_ASSERT_CHECK_SPEC_HANDLER,
41239+
ZEND_ASSERT_CHECK_SPEC_HANDLER,
41240+
ZEND_ASSERT_CHECK_SPEC_HANDLER,
41241+
ZEND_ASSERT_CHECK_SPEC_HANDLER,
41242+
ZEND_ASSERT_CHECK_SPEC_HANDLER,
41243+
ZEND_ASSERT_CHECK_SPEC_HANDLER,
41244+
ZEND_ASSERT_CHECK_SPEC_HANDLER,
41245+
ZEND_ASSERT_CHECK_SPEC_HANDLER,
41246+
ZEND_ASSERT_CHECK_SPEC_HANDLER,
41247+
ZEND_ASSERT_CHECK_SPEC_HANDLER,
41248+
ZEND_ASSERT_CHECK_SPEC_HANDLER,
41249+
ZEND_ASSERT_CHECK_SPEC_HANDLER,
41250+
ZEND_ASSERT_CHECK_SPEC_HANDLER,
41251+
ZEND_ASSERT_CHECK_SPEC_HANDLER,
41252+
ZEND_ASSERT_CHECK_SPEC_HANDLER,
41253+
ZEND_ASSERT_CHECK_SPEC_HANDLER,
41254+
ZEND_ASSERT_CHECK_SPEC_HANDLER,
41255+
ZEND_ASSERT_CHECK_SPEC_HANDLER,
41256+
ZEND_ASSERT_CHECK_SPEC_HANDLER,
41257+
ZEND_ASSERT_CHECK_SPEC_HANDLER,
41258+
ZEND_ASSERT_CHECK_SPEC_HANDLER,
41259+
ZEND_ASSERT_CHECK_SPEC_HANDLER,
41260+
ZEND_ASSERT_CHECK_SPEC_HANDLER,
41261+
ZEND_ASSERT_CHECK_SPEC_HANDLER,
41262+
ZEND_ASSERT_CHECK_SPEC_HANDLER,
4126341263
ZEND_JMP_SET_SPEC_CONST_HANDLER,
4126441264
ZEND_JMP_SET_SPEC_CONST_HANDLER,
4126541265
ZEND_JMP_SET_SPEC_CONST_HANDLER,

‎Zend/zend_vm_opcodes.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ const char *zend_vm_opcodes_map[171] = {
159159
"ZEND_POST_INC_OBJ",
160160
"ZEND_POST_DEC_OBJ",
161161
"ZEND_ASSIGN_OBJ",
162-
"ZEND_ASSERT_CHECK",
162+
NULL,
163163
"ZEND_INSTANCEOF",
164164
"ZEND_DECLARE_CLASS",
165165
"ZEND_DECLARE_INHERITED_CLASS",
@@ -173,7 +173,7 @@ const char *zend_vm_opcodes_map[171] = {
173173
"ZEND_ISSET_ISEMPTY_PROP_OBJ",
174174
"ZEND_HANDLE_EXCEPTION",
175175
"ZEND_USER_OPCODE",
176-
NULL,
176+
"ZEND_ASSERT_CHECK",
177177
"ZEND_JMP_SET",
178178
"ZEND_DECLARE_LAMBDA_FUNCTION",
179179
"ZEND_ADD_TRAIT",

‎Zend/zend_vm_opcodes.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,6 @@ END_EXTERN_C()
161161
#define ZEND_POST_INC_OBJ 134
162162
#define ZEND_POST_DEC_OBJ 135
163163
#define ZEND_ASSIGN_OBJ 136
164-
#define ZEND_ASSERT_CHECK 137
165164
#define ZEND_INSTANCEOF 138
166165
#define ZEND_DECLARE_CLASS 139
167166
#define ZEND_DECLARE_INHERITED_CLASS 140
@@ -174,6 +173,7 @@ END_EXTERN_C()
174173
#define ZEND_ISSET_ISEMPTY_PROP_OBJ 148
175174
#define ZEND_HANDLE_EXCEPTION 149
176175
#define ZEND_USER_OPCODE 150
176+
#define ZEND_ASSERT_CHECK 151
177177
#define ZEND_JMP_SET 152
178178
#define ZEND_DECLARE_LAMBDA_FUNCTION 153
179179
#define ZEND_ADD_TRAIT 154

0 commit comments

Comments
 (0)