]> granicus.if.org Git - php/commitdiff
Replace code with zend_clean_and_cache_symbol_table() call
authorNikita Popov <nikic@php.net>
Sun, 16 Sep 2012 19:54:48 +0000 (21:54 +0200)
committerNikita Popov <nikic@php.net>
Sun, 16 Sep 2012 19:54:48 +0000 (21:54 +0200)
I replaced other instances of this code with the function call, but missed
this one.

Zend/zend_execute_API.c

index fb0c18b27cc3fc1d71e0342adbf6bc1a3c7a22e4..ddf86e800843675812d2fad154a23b995c740038 100644 (file)
@@ -964,15 +964,7 @@ int zend_call_function(zend_fcall_info *fci, zend_fcall_info_cache *fci_cache TS
                }
 
                if (!fci->symbol_table && EG(active_symbol_table)) {
-                       if (EG(symtable_cache_ptr)>=EG(symtable_cache_limit)) {
-                               zend_hash_destroy(EG(active_symbol_table));
-                               FREE_HASHTABLE(EG(active_symbol_table));
-                       } else {
-                               /* clean before putting into the cache, since clean
-                                  could call dtors, which could use cached hash */
-                               zend_hash_clean(EG(active_symbol_table));
-                               *(++EG(symtable_cache_ptr)) = EG(active_symbol_table);
-                       }
+                       zend_clean_and_cache_symbol_table(EG(active_symbol_table) TSRMLS_CC);
                }
                EG(active_symbol_table) = calling_symbol_table;
                EG(active_op_array) = original_op_array;