Use RETURN_THROWS() for WeakMap methods

This commit is contained in:
Máté Kocsis 2024-06-18 22:34:18 +02:00
parent fbe317bf21
commit c588db1ee7
No known key found for this signature in database
GPG key ID: FD055E41728BF310

View file

@ -694,12 +694,12 @@ ZEND_METHOD(WeakMap, offsetGet)
zval *key; zval *key;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &key) == FAILURE) { if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &key) == FAILURE) {
return; RETURN_THROWS();
} }
zval *zv = zend_weakmap_read_dimension(Z_OBJ_P(ZEND_THIS), key, BP_VAR_R, NULL); zval *zv = zend_weakmap_read_dimension(Z_OBJ_P(ZEND_THIS), key, BP_VAR_R, NULL);
if (!zv) { if (!zv) {
return; RETURN_THROWS();
} }
ZVAL_COPY(return_value, zv); ZVAL_COPY(return_value, zv);
@ -710,7 +710,7 @@ ZEND_METHOD(WeakMap, offsetSet)
zval *key, *value; zval *key, *value;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "zz", &key, &value) == FAILURE) { if (zend_parse_parameters(ZEND_NUM_ARGS(), "zz", &key, &value) == FAILURE) {
return; RETURN_THROWS();
} }
zend_weakmap_write_dimension(Z_OBJ_P(ZEND_THIS), key, value); zend_weakmap_write_dimension(Z_OBJ_P(ZEND_THIS), key, value);
@ -721,7 +721,7 @@ ZEND_METHOD(WeakMap, offsetExists)
zval *key; zval *key;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &key) == FAILURE) { if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &key) == FAILURE) {
return; RETURN_THROWS();
} }
RETURN_BOOL(zend_weakmap_has_dimension(Z_OBJ_P(ZEND_THIS), key, /* check_empty */ 0)); RETURN_BOOL(zend_weakmap_has_dimension(Z_OBJ_P(ZEND_THIS), key, /* check_empty */ 0));
@ -732,7 +732,7 @@ ZEND_METHOD(WeakMap, offsetUnset)
zval *key; zval *key;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &key) == FAILURE) { if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &key) == FAILURE) {
return; RETURN_THROWS();
} }
zend_weakmap_unset_dimension(Z_OBJ_P(ZEND_THIS), key); zend_weakmap_unset_dimension(Z_OBJ_P(ZEND_THIS), key);
@ -741,7 +741,7 @@ ZEND_METHOD(WeakMap, offsetUnset)
ZEND_METHOD(WeakMap, count) ZEND_METHOD(WeakMap, count)
{ {
if (zend_parse_parameters_none() == FAILURE) { if (zend_parse_parameters_none() == FAILURE) {
return; RETURN_THROWS();
} }
zend_long count; zend_long count;
@ -752,7 +752,7 @@ ZEND_METHOD(WeakMap, count)
ZEND_METHOD(WeakMap, getIterator) ZEND_METHOD(WeakMap, getIterator)
{ {
if (zend_parse_parameters_none() == FAILURE) { if (zend_parse_parameters_none() == FAILURE) {
return; RETURN_THROWS();
} }
zend_create_internal_iterator_zval(return_value, ZEND_THIS); zend_create_internal_iterator_zval(return_value, ZEND_THIS);