Use better hash functions (reuse key and avoid hash value recalculation)

diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c
index 3420a099882bc5cfb5d93ba14a690f8a9ae2017c..c3ceb44fea90fd9fa5299f225ac4602d9e69dbfe 100644 (file)
--- a/ext/pcre/php_pcre.c
+++ b/ext/pcre/php_pcre.c
@@ -1395,10 +1395,13 @@ static int preg_replace_impl(zval *return_value, zval *regex, zval *replace, zva
                        if ((result = php_replace_in_subject(regex, replace, subject_entry, limit_val, is_callable_replace, &replace_count)) != NULL) {
                                if (!is_filter || replace_count > old_replace_count) {
                                        /* Add to return array */
+                                       zval zv;
+
+                                       ZVAL_STR(&zv, result);
                                        if (string_key) {
-                                               add_assoc_str_ex(return_value, string_key->val, string_key->len, result);
+                                               zend_hash_add_new(Z_ARRVAL_P(return_value), string_key, &zv);
                                        } else {
-                                               add_index_str(return_value, num_key, result);
+                                               zend_hash_index_add_new(Z_ARRVAL_P(return_value), num_key, &zv);
                                        }
                                } else {
                                        zend_string_release(result);