Improve error handling

dstogov · dstogov · commit d3bf88edf177 · 2023-09-14T20:22:25.000+03:00
diff --git a/ext/opcache/config.m4 b/ext/opcache/config.m4
@@ -147,7 +147,7 @@ if test "$PHP_OPCACHE" != "no"; then
 
     JIT_CFLAGS="-I@ext_builddir@/jit/ir -D${IR_TARGET} -DIR_PHP"
     if test "$ZEND_DEBUG" = "yes"; then
-      JIT_CFLAGS="${JIT_CFLAGS} -DIR_DEBUG -DIR_DEBUG_MESSAGES"
+      JIT_CFLAGS="${JIT_CFLAGS} -DIR_DEBUG"
     fi
   fi
 
diff --git a/ext/opcache/config.w32 b/ext/opcache/config.w32
@@ -55,7 +55,7 @@ if (PHP_OPCACHE != "no") {
 
 			ADD_FLAG("CFLAGS_OPCACHE", "/I \"ext\\opcache\\jit\\ir\" /D "+ir_target+" /D IR_PHP");
 			if (PHP_DEBUG == "yes") {
-				ADD_FLAG("CFLAGS_OPCACHE", "/D IR_DEBUG /D IR_DEBUG_MESSAGES");
+				ADD_FLAG("CFLAGS_OPCACHE", "/D IR_DEBUG");
 			}
 
 			if (CHECK_HEADER_ADD_INCLUDE("capstone\\capstone.h", "CFLAGS_OPCACHE", PHP_OPCACHE+ ";" + PHP_PHP_BUILD + "\\include") &&
diff --git a/ext/opcache/jit/ir b/ext/opcache/jit/ir
@@ -1 +1 @@
-Subproject commit aeaa6404b7f04e12717354002b8cb2f2c14c38ef
+Subproject commit 8977307f4e96ee03847d7f2eb809b3080f9ed662
diff --git a/ext/opcache/jit/zend_jit_ir.c b/ext/opcache/jit/zend_jit_ir.c
@@ -648,7 +648,8 @@ uint32_t zend_jit_duplicate_exit_point(ir_ctx *ctx, zend_jit_trace_info *t, uint
 	uint32_t new_exit_point = t->exit_count;
 
 	if (new_exit_point >= ZEND_JIT_TRACE_MAX_EXITS) {
-		ZEND_ASSERT(0 && "ZEND_JIT_TRACE_MAX_EXITS");
+		ctx->status = -ZEND_JIT_TRACE_STOP_TOO_MANY_EXITS;
+		return exit_point;
 	}
 
 	t->exit_count++;

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ if (PHP_OPCACHE != "no") {`
`55`	`55`
`56`	`56`	`ADD_FLAG("CFLAGS_OPCACHE", "/I \"ext\\opcache\\jit\\ir\" /D "+ir_target+" /D IR_PHP");`
`57`	`57`	`if (PHP_DEBUG == "yes") {`
`58`		`- ADD_FLAG("CFLAGS_OPCACHE", "/D IR_DEBUG /D IR_DEBUG_MESSAGES");`
	`58`	`+ ADD_FLAG("CFLAGS_OPCACHE", "/D IR_DEBUG");`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`if (CHECK_HEADER_ADD_INCLUDE("capstone\\capstone.h", "CFLAGS_OPCACHE", PHP_OPCACHE+ ";" + PHP_PHP_BUILD + "\\include") &&`
Original file line number	Diff line number	Diff line change
`@@ -648,7 +648,8 @@ uint32_t zend_jit_duplicate_exit_point(ir_ctx ctx, zend_jit_trace_info t, uint`
`648`	`648`	`uint32_t new_exit_point = t->exit_count;`
`649`	`649`
`650`	`650`	`if (new_exit_point >= ZEND_JIT_TRACE_MAX_EXITS) {`
`651`		`- ZEND_ASSERT(0 && "ZEND_JIT_TRACE_MAX_EXITS");`
	`651`	`+ ctx->status = -ZEND_JIT_TRACE_STOP_TOO_MANY_EXITS;`
	`652`	`+ return exit_point;`
`652`	`653`	`}`
`653`	`654`
`654`	`655`	`t->exit_count++;`