Update zend_vm_call_opcode_handler()

Author: arnaud-lb

Zend/zend_vm_gen.php

@@ -3011,11 +3011,26 @@ function gen_vm($def, $skel) {
         out($f, "\t}\n");
         out($f, "#else\n");
         out($f, "\topline = ((opcode_handler_t)OPLINE->handler)(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);\n");
-        out($f, "\tif (EXPECTED(opline != NULL)) {\n");
-        out($f, "\t\tret = EG(current_execute_data) != ex ? (int)(EG(current_execute_data)->prev_execute_data != ex) + 1 : 0;\n");
-        out($f, "\t\tSAVE_OPLINE();\n");
+
+        out($f, "# ifdef ZEND_HIGH_HALF_KERNEL\n");
+        out($f, "\tif (UNEXPECTED((intptr_t)opline <= 0)) {\n");
+        out($f, "# else\n");
+        out($f, "\tif (UNEXPECTED(((uintptr_t)opline & ZEND_VM_ENTER_BIT))) {\n");
+        out($f, "# endif\n");
+        out($f, "\t\topline = (const zend_op*)((uintptr_t)opline & ~ZEND_VM_ENTER_BIT);\n");
+        out($f, "\t\tif (EXPECTED(opline)) {\n");
+        out($f, "\t\t\t/* ZEND_VM_ENTER() or ZEND_VM_LEAVE() */\n");
+        out($f, "\t\t\tret = EG(current_execute_data) != ex ? (int)(EG(current_execute_data)->prev_execute_data != ex) + 1 : 0;\n");
+        out($f, "\t\t\texecute_data = EG(current_execute_data);\n");
+        out($f, "\t\t\tSAVE_OPLINE();\n");
+        out($f, "\t\t} else {\n");
+        out($f, "\t\t\t/* ZEND_VM_RETURN() */\n");
+        out($f, "\t\t\tret = -1;\n");
+        out($f, "\t\t}\n");
         out($f, "\t} else {\n");
-        out($f, "\t\tret = -1;\n");
+        out($f, "\t\t/* ZEND_VM_CONTINUE() */\n");
+        out($f, "\t\tSAVE_OPLINE();\n");
+        out($f, "\t\tret = 0;\n");
         out($f, "\t}\n");
         out($f, "#endif\n");
         out($f, "#ifdef ZEND_VM_FP_GLOBAL_REG\n");