Skip to content

Commit 3bc1ce8

Browse files
committed
Other change to see if this is root cause of JIT failure
Might be due to EXT_CALL zend_is_true, r0 in zend_jit_x86.dasc line 7932
1 parent a953eaa commit 3bc1ce8

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

Zend/zend_operators.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2524,9 +2524,9 @@ ZEND_API zend_result ZEND_FASTCALL decrement_function(zval *op1) /* {{{ */
25242524
}
25252525
/* }}} */
25262526

2527-
ZEND_API bool ZEND_FASTCALL zend_is_true(zval *op) /* {{{ */
2527+
ZEND_API int ZEND_FASTCALL zend_is_true(zval *op) /* {{{ */
25282528
{
2529-
return i_zend_is_true(op);
2529+
return (int) i_zend_is_true(op);
25302530
}
25312531
/* }}} */
25322532

Zend/zend_operators.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -341,15 +341,15 @@ static zend_always_inline zend_bool try_convert_to_string(zval *op) {
341341
#define convert_to_string(op) if (Z_TYPE_P(op) != IS_STRING) { _convert_to_string((op)); }
342342

343343

344-
ZEND_API bool ZEND_FASTCALL zend_is_true(zval *op);
344+
ZEND_API int ZEND_FASTCALL zend_is_true(zval *op);
345345
ZEND_API bool ZEND_FASTCALL zend_object_is_true(zval *op);
346346

347347
#define zval_is_true(op) \
348348
zend_is_true(op)
349349

350-
static zend_always_inline int i_zend_is_true(zval *op)
350+
static zend_always_inline bool i_zend_is_true(zval *op)
351351
{
352-
int result = 0;
352+
bool result = 0;
353353

354354
again:
355355
switch (Z_TYPE_P(op)) {

0 commit comments

Comments
 (0)