Skip to content

Commit e94ab04

Browse files
authored
Align error messages between normal VM and JIT for RW when using object as array (#12799)
1 parent d8ef868 commit e94ab04

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

Zend/zend_execute.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1417,9 +1417,9 @@ static ZEND_COLD void zend_verify_missing_return_type(const zend_function *zf)
14171417
zend_verify_return_error(zf, NULL);
14181418
}
14191419

1420-
static zend_never_inline ZEND_COLD void ZEND_FASTCALL zend_use_object_as_array(void)
1420+
static zend_never_inline ZEND_COLD void ZEND_FASTCALL zend_use_object_as_array(const zend_object *object)
14211421
{
1422-
zend_throw_error(NULL, "Cannot use object as array");
1422+
zend_throw_error(NULL, "Cannot use object of type %s as array", ZSTR_VAL(object->ce->name));
14231423
}
14241424

14251425
static zend_never_inline ZEND_COLD void ZEND_FASTCALL zend_illegal_offset(void)
@@ -1487,7 +1487,7 @@ static zend_never_inline void zend_binary_assign_op_obj_dim(zend_object *obj, zv
14871487
}
14881488
zval_ptr_dtor(&res);
14891489
} else {
1490-
zend_use_object_as_array();
1490+
zend_use_object_as_array(obj);
14911491
if (UNEXPECTED(RETURN_VALUE_USED(opline))) {
14921492
ZVAL_NULL(EX_VAR(opline->result.var));
14931493
}

0 commit comments

Comments
 (0)