Skip to content

Commit 975d144

Browse files
committed
Fixed user-opcode support
1 parent 2db6d8e commit 975d144

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Zend/zend_vm_execute.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69301,7 +69301,7 @@ ZEND_API int zend_vm_call_opcode_handler(zend_execute_data* ex)
6930169301
LOAD_OPLINE();
6930269302
#if defined(ZEND_VM_FP_GLOBAL_REG) && defined(ZEND_VM_IP_GLOBAL_REG)
6930369303
#if (ZEND_VM_KIND == ZEND_VM_KIND_HYBRID)
69304-
handler = (opcode_handler_t)zend_vm_get_opcode_handler_func(opline->opcode, opline);
69304+
handler = (opcode_handler_t)zend_vm_get_opcode_handler_func(zend_user_opcodes[opline->opcode], opline);
6930569305
handler(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
6930669306
if (EXPECTED(opline != &hybrid_halt_op)) {
6930769307
#else

Zend/zend_vm_gen.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2599,7 +2599,7 @@ function gen_vm($def, $skel) {
25992599
out($f,"#if defined(ZEND_VM_FP_GLOBAL_REG) && defined(ZEND_VM_IP_GLOBAL_REG)\n");
26002600
if (ZEND_VM_KIND == ZEND_VM_KIND_HYBRID) {
26012601
out($f,"#if (ZEND_VM_KIND == ZEND_VM_KIND_HYBRID)\n");
2602-
out($f, "\thandler = (opcode_handler_t)zend_vm_get_opcode_handler_func(opline->opcode, opline);\n");
2602+
out($f, "\thandler = (opcode_handler_t)zend_vm_get_opcode_handler_func(zend_user_opcodes[opline->opcode], opline);\n");
26032603
out($f, "\thandler(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);\n");
26042604
out($f, "\tif (EXPECTED(opline != &hybrid_halt_op)) {\n");
26052605
out($f,"#else\n");

0 commit comments

Comments
 (0)