Commit: 6233408a2a51389a2bbd250c5900d395648e897f Author: Nikita Popov <ni...@php.net> Wed, 20 Jun 2012 21:31:23 +0200 Parents: d939d2dee58bf894ae9af631bdee173243157068 Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=6233408a2a51389a2bbd250c5900d395648e897f Log: Fix thread safe build Changed paths: M Zend/zend_execute.c M Zend/zend_execute.h M Zend/zend_generators.c M Zend/zend_vm_def.h M Zend/zend_vm_execute.h Diff: diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index c7ef212..0e40650 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -1538,7 +1538,7 @@ ZEND_API zval **zend_get_zval_ptr_ptr(int op_type, const znode_op *node, const t return get_zval_ptr_ptr(op_type, node, Ts, should_free, type); } -void zend_clean_and_cache_symbol_table(HashTable *symbol_table) /* {{{ */ +void zend_clean_and_cache_symbol_table(HashTable *symbol_table TSRMLS_DC) /* {{{ */ { if (EG(symtable_cache_ptr) >= EG(symtable_cache_limit)) { zend_hash_destroy(symbol_table); diff --git a/Zend/zend_execute.h b/Zend/zend_execute.h index 48f46bb..92160b5 100644 --- a/Zend/zend_execute.h +++ b/Zend/zend_execute.h @@ -432,7 +432,7 @@ ZEND_API zval **zend_get_zval_ptr_ptr(int op_type, const znode_op *node, const t ZEND_API int zend_do_fcall(ZEND_OPCODE_HANDLER_ARGS); -void zend_clean_and_cache_symbol_table(HashTable *symbol_table); +void zend_clean_and_cache_symbol_table(HashTable *symbol_table TSRMLS_DC); void zend_free_compiled_variables(zval ***CVs, int num); void **zend_copy_arguments(void **arguments_end); diff --git a/Zend/zend_generators.c b/Zend/zend_generators.c index f8374b8..b7538e7 100644 --- a/Zend/zend_generators.c +++ b/Zend/zend_generators.c @@ -34,7 +34,7 @@ void zend_generator_close(zend_generator *generator, zend_bool finished_executio if (!execute_data->symbol_table) { zend_free_compiled_variables(execute_data->CVs, execute_data->op_array->last_var); } else { - zend_clean_and_cache_symbol_table(execute_data->symbol_table); + zend_clean_and_cache_symbol_table(execute_data->symbol_table TSRMLS_CC); } if (execute_data->current_this) { @@ -560,7 +560,7 @@ ZEND_METHOD(Generator, close) generator = (zend_generator *) zend_object_store_get_object(getThis() TSRMLS_CC); - zend_generator_close(generator, 0); + zend_generator_close(generator, 0 TSRMLS_CC); } /* }}} */ diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index e5d8a76..fea1f40 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -2572,7 +2572,7 @@ ZEND_VM_HELPER(zend_leave_helper, ANY, ANY) EG(active_op_array) = EX(op_array); EG(return_value_ptr_ptr) = EX(original_return_value); if (EG(active_symbol_table)) { - zend_clean_and_cache_symbol_table(EG(active_symbol_table)); + zend_clean_and_cache_symbol_table(EG(active_symbol_table) TSRMLS_CC); } EG(active_symbol_table) = EX(symbol_table); @@ -2717,7 +2717,7 @@ ZEND_VM_HELPER(zend_do_fcall_common_helper, ANY, ANY) EG(active_op_array) = EX(op_array); EG(return_value_ptr_ptr) = EX(original_return_value); if (EG(active_symbol_table)) { - zend_clean_and_cache_symbol_table(EG(active_symbol_table)); + zend_clean_and_cache_symbol_table(EG(active_symbol_table) TSRMLS_CC); } EG(active_symbol_table) = EX(symbol_table); } else { /* ZEND_OVERLOADED_FUNCTION */ @@ -5265,7 +5265,7 @@ ZEND_VM_HANDLER(159, ZEND_SUSPEND_AND_RETURN_GENERATOR, ANY, ANY) if (!EG(active_symbol_table)) { zend_free_compiled_variables(EX_CVs(), execute_data->op_array->last_var); } else { - zend_clean_and_cache_symbol_table(EG(active_symbol_table)); + zend_clean_and_cache_symbol_table(EG(active_symbol_table) TSRMLS_CC); } efree(execute_data); } diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index 6f1a885..0f965c5 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -556,7 +556,7 @@ static int ZEND_FASTCALL zend_leave_helper_SPEC(ZEND_OPCODE_HANDLER_ARGS) EG(active_op_array) = EX(op_array); EG(return_value_ptr_ptr) = EX(original_return_value); if (EG(active_symbol_table)) { - zend_clean_and_cache_symbol_table(EG(active_symbol_table)); + zend_clean_and_cache_symbol_table(EG(active_symbol_table) TSRMLS_CC); } EG(active_symbol_table) = EX(symbol_table); @@ -701,7 +701,7 @@ static int ZEND_FASTCALL zend_do_fcall_common_helper_SPEC(ZEND_OPCODE_HANDLER_AR EG(active_op_array) = EX(op_array); EG(return_value_ptr_ptr) = EX(original_return_value); if (EG(active_symbol_table)) { - zend_clean_and_cache_symbol_table(EG(active_symbol_table)); + zend_clean_and_cache_symbol_table(EG(active_symbol_table) TSRMLS_CC); } EG(active_symbol_table) = EX(symbol_table); } else { /* ZEND_OVERLOADED_FUNCTION */ @@ -1248,7 +1248,7 @@ static int ZEND_FASTCALL ZEND_SUSPEND_AND_RETURN_GENERATOR_SPEC_HANDLER(ZEND_OP if (!EG(active_symbol_table)) { zend_free_compiled_variables(EX_CVs(), execute_data->op_array->last_var); } else { - zend_clean_and_cache_symbol_table(EG(active_symbol_table)); + zend_clean_and_cache_symbol_table(EG(active_symbol_table) TSRMLS_CC); } efree(execute_data); } -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
