diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2018-03-14 09:41:55 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2018-03-14 09:41:55 +0300 |
| commit | 9dc666197662369f7341d5d7beec4a5ca87902a3 (patch) | |
| tree | ae5419d7d5c023f58c73038104625aa26f117424 /Zend/zend_vm_gen.php | |
| parent | a1a2ad701c5c97174a7bd1f59b5e381ead2b824d (diff) | |
| parent | 975d144027e8e8de34bf91a02c60db34f3b80683 (diff) | |
| download | php-git-9dc666197662369f7341d5d7beec4a5ca87902a3.tar.gz | |
Merge branch 'PHP-7.2'
* PHP-7.2:
Fixed user-opcode support
Diffstat (limited to 'Zend/zend_vm_gen.php')
| -rw-r--r-- | Zend/zend_vm_gen.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_vm_gen.php b/Zend/zend_vm_gen.php index 18633393e7..03b964b278 100644 --- a/Zend/zend_vm_gen.php +++ b/Zend/zend_vm_gen.php @@ -2777,7 +2777,7 @@ function gen_vm($def, $skel) { out($f,"#if defined(ZEND_VM_FP_GLOBAL_REG) && defined(ZEND_VM_IP_GLOBAL_REG)\n"); if (ZEND_VM_KIND == ZEND_VM_KIND_HYBRID) { out($f,"#if (ZEND_VM_KIND == ZEND_VM_KIND_HYBRID)\n"); - out($f, "\thandler = (opcode_handler_t)zend_vm_get_opcode_handler_func(opline->opcode, opline);\n"); + out($f, "\thandler = (opcode_handler_t)zend_vm_get_opcode_handler_func(zend_user_opcodes[opline->opcode], opline);\n"); out($f, "\thandler(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);\n"); out($f, "\tif (EXPECTED(opline != &hybrid_halt_op)) {\n"); out($f,"#else\n"); |