Commit d3bf88e

committed

Improve error handling

1 parent 9cb8bcf commit d3bf88eCopy full SHA for d3bf88e

File tree

-4

lines changed

-4

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ if test "$PHP_OPCACHE" != "no"; then`
`147`	`147`
`148`	`148`	`JIT_CFLAGS="-I@ext_builddir@/jit/ir -D${IR_TARGET} -DIR_PHP"`
`149`	`149`	`if test "$ZEND_DEBUG" = "yes"; then`
`150`		`- JIT_CFLAGS="${JIT_CFLAGS} -DIR_DEBUG -DIR_DEBUG_MESSAGES"`
	`150`	`+ JIT_CFLAGS="${JIT_CFLAGS} -DIR_DEBUG"`
`151`	`151`	`fi`
`152`	`152`	`fi`
`153`	`153`

Lines changed: 1 addition & 1 deletion

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") &&`

Submodule ir updated 6 files

Lines changed: 2 additions & 1 deletion

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++;`

Comments

(0)