From 4cfc8f6d7aa9f08bf88d3ef2fa5351874feb4f2d Mon Sep 17 00:00:00 2001 From: Niels Dossche <7771979+nielsdos@users.noreply.github.com> Date: Sun, 29 Oct 2023 14:42:23 +0000 Subject: [PATCH] Remove dead stores from ext/spl (#12550) --- ext/spl/spl_fixedarray.c | 2 +- ext/spl/spl_iterators.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ext/spl/spl_fixedarray.c b/ext/spl/spl_fixedarray.c index 04330caf83a..dbdc08c5a87 100644 --- a/ext/spl/spl_fixedarray.c +++ b/ext/spl/spl_fixedarray.c @@ -740,7 +740,7 @@ PHP_METHOD(SplFixedArray, fromArray) } spl_fixedarray_init(&array, tmp); - ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(data), num_index, str_index, element) { + ZEND_HASH_FOREACH_NUM_KEY_VAL(Z_ARRVAL_P(data), num_index, element) { ZVAL_COPY_DEREF(&array.elements[num_index], element); } ZEND_HASH_FOREACH_END(); diff --git a/ext/spl/spl_iterators.c b/ext/spl/spl_iterators.c index ab9b79f73c8..69ce2651075 100644 --- a/ext/spl/spl_iterators.c +++ b/ext/spl/spl_iterators.c @@ -1198,7 +1198,7 @@ PHP_METHOD(RecursiveTreeIterator, current) } if (object->flags & RTIT_BYPASS_CURRENT) { - zend_object_iterator *iterator = object->iterators[object->level].iterator; + zend_object_iterator *iterator; zval *data; SPL_FETCH_SUB_ITERATOR(iterator, object); @@ -1920,7 +1920,7 @@ PHP_METHOD(RegexIterator, accept) /* {{{ Returns current regular expression */ PHP_METHOD(RegexIterator, getRegex) { - spl_dual_it_object *intern = Z_SPLDUAL_IT_P(ZEND_THIS); + spl_dual_it_object *intern; if (zend_parse_parameters_none() == FAILURE) { RETURN_THROWS();