]> granicus.if.org Git - php/commitdiff
Fixed dispatch from inlined hybrid opcode to another opcode
authorDmitry Stogov <dmitry@zend.com>
Mon, 8 Jul 2019 15:01:46 +0000 (18:01 +0300)
committerDmitry Stogov <dmitry@zend.com>
Mon, 8 Jul 2019 15:01:46 +0000 (18:01 +0300)
Zend/zend_vm_gen.php

index cc3998280f3cce440ae6872464c7dc02f6020a6f..05c0688496c8323b67aa766120a8e7f453004b3a 100755 (executable)
@@ -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])) {