Add tracing jit support

Author: TysonAndre

ext/opcache/jit/zend_jit.c

@@ -3215,7 +3215,7 @@ static int zend_jit(const zend_op_array *op_array, zend_ssa *ssa, const zend_op
 						if ((op1_info & (MAY_BE_UNDEF|MAY_BE_ANY|MAY_BE_REF)) != MAY_BE_ARRAY) {
 							break;
 						}
-						if (!zend_jit_count(&dasm_state, opline, op1_info, OP1_REG_ADDR())) {
+						if (!zend_jit_count(&dasm_state, opline, op1_info, OP1_REG_ADDR(), zend_may_throw(opline, ssa_op, op_array, ssa))) {
 							goto jit_failure;
 						}
 						goto done;

ext/opcache/jit/zend_jit_trace.c

@@ -5521,7 +5521,7 @@ static const void *zend_jit_trace(zend_jit_trace_rec *trace_buffer, uint32_t par
 								break;
 							}
 						}
-						if (!zend_jit_count(&dasm_state, opline, op1_info, op1_addr)) {
+						if (!zend_jit_count(&dasm_state, opline, op1_info, op1_addr, zend_may_throw(opline, ssa_op, op_array, ssa))) {
 							goto jit_failure;
 						}
 						goto done;

ext/opcache/jit/zend_jit_x86.dasc

@@ -14249,13 +14249,11 @@ static int zend_jit_strlen(dasm_State **Dst, const zend_op *opline, uint32_t op1
 	return 1;
 }
 
-static int zend_jit_count(dasm_State **Dst, const zend_op *opline, uint32_t op1_info, zend_jit_addr op1_addr)
+static int zend_jit_count(dasm_State **Dst, const zend_op *opline, uint32_t op1_info, zend_jit_addr op1_addr, int may_throw)
 {
 	zend_jit_addr res_addr = RES_ADDR();
 
 	if (opline->op1_type == IS_CONST) {
-		return 0;
-		/*
 		zval *zv;
 		zend_long count;
 
@@ -14265,7 +14263,6 @@ static int zend_jit_count(dasm_State **Dst, const zend_op *opline, uint32_t op1_
 
 		|	SET_ZVAL_LVAL res_addr, count
 		|	SET_ZVAL_TYPE_INFO res_addr, IS_LONG
-		*/
 	} else {
 		ZEND_ASSERT((op1_info & (MAY_BE_UNDEF|MAY_BE_ANY|MAY_BE_REF)) == MAY_BE_ARRAY);
 		// Note: See the implementation of ZEND_COUNT in Zend/zend_vm_def.h - arrays do not contain IS_UNDEF starting in php 8.1+.
@@ -14277,6 +14274,10 @@ static int zend_jit_count(dasm_State **Dst, const zend_op *opline, uint32_t op1_
 		|	SET_ZVAL_TYPE_INFO res_addr, IS_LONG
 		|	FREE_OP opline->op1_type, opline->op1, op1_info, 0, opline
 	}
+
+	if (may_throw) {
+		return zend_jit_check_exception(Dst);
+	}
 	return 1;
 }
 

ext/opcache/tests/jit/count_001.phpt

@@ -10,6 +10,11 @@ opcache.jit_buffer_size=1M
 <?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
+class ThrowsInDestructor {
+    public function __destruct() {
+        throw new RuntimeException("In destructor");
+    }
+}
 class C {
     public static function create_array(int $i): array {
         return array_fill(0, $i, new stdClass());
@@ -29,10 +34,24 @@ class C {
     public static function count_ref(array &$ref): int {
         return count($ref);
     }
+
+    public static function count_throws(): int {
+        $result = count([new ThrowsInDestructor()]);
+        echo "Unreachable\n";
+        return $result;
+    }
 }
 C::foo();
 $x = ['x', 'y', 'z', 'a', new stdClass()];
 echo C::count_ref($x), "\n";
+for ($i = 0; $i < 5; $i++) {
+    try {
+        echo C::count_throws(), "\n";
+    } catch (RuntimeException $e) {
+        printf("Caught %s\n", $e->getMessage());
+    }
+}
+
 --EXPECT--
 0
 1
@@ -42,3 +61,8 @@ echo C::count_ref($x), "\n";
 3
 4
 5
+Caught In destructor
+Caught In destructor
+Caught In destructor
+Caught In destructor
+Caught In destructor