diff options
author | Dmitry Stogov <dmitry@zend.com> | 2019-07-08 18:01:46 +0300 |
---|---|---|
committer | Dmitry Stogov <dmitry@zend.com> | 2019-07-08 18:01:46 +0300 |
commit | 1804fd634e9b7d25cc885f22dd822c51f26e8d0d (patch) | |
tree | 9d736648d5333e0247c6d4b8de3f74b6c1d2723c | |
parent | 428cfdd1810b17f0064b7691276f0eb92dc963b6 (diff) | |
download | php-git-1804fd634e9b7d25cc885f22dd822c51f26e8d0d.tar.gz |
Fixed dispatch from inlined hybrid opcode to another opcode
-rwxr-xr-x | Zend/zend_vm_gen.php | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/Zend/zend_vm_gen.php b/Zend/zend_vm_gen.php index cc3998280f..05c0688496 100755 --- a/Zend/zend_vm_gen.php +++ b/Zend/zend_vm_gen.php @@ -868,11 +868,7 @@ function gen_code($f, $spec, $kind, $export, $code, $op1, $op2, $name, $extra_sp $name = $matches[1]; $opcode = $opcodes[$opnames[$name]]; - if (is_hot_handler($opcode["hot"], $op1, $op2, $extra_spec)) { - return "goto " . opcode_name($name, $spec, $op1, $op2) . "_LABEL"; - } else { - return "ZEND_VM_TAIL_CALL(" . opcode_name($name, $spec, $op1, $op2) . "_HANDLER(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU))"; - } + return "goto " . opcode_name($name, $spec, $op1, $op2, $extra_spec) . "_LABEL"; } else { // ZEND_VM_DISPATCH_TO_HELPER if (isset($matches[2])) { |