com php-src: Revert accidentally committed closures.c and execute.c: Zend/zend_closures.c Zend/zend_execute.c

Commit: e878dff5d866f3e004153c34e83d87d6801bc1b8 Author: Bob Weinand <bobwei9@hotmail.com> Sat, 19 Sep 2015 23:22:07 +0200 Parents: 08e253cdbc0a98e160cfd9c810ba213c7bcb3512 Branches: PHP-7.0 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e878dff5d866f3e004153c34e83d87d6801bc1b8 Log: Revert accidentally committed closures.c and execute.c Changed paths: M Zend/zend_closures.c M Zend/zend_execute.c Diff: diff --git a/Zend/zend_closures.c b/Zend/zend_closures.c index 251710e..50aa7d4 100644 --- a/Zend/zend_closures..c +++ b/Zend/zend_closures.c @@ -134,7 +134,7 @@ ZEND_METHOD(Closure, call) fci_cache.function_handler = &my_function; /* Runtime cache relies on bound scope to be immutable, hence we need a separate rt cache in case scope changed */ - if (ZEND_USER_CODE(my_function.type) && closure->func.common.scope != Z_OBJCE_P(newthis) && my_function.op_array.cache_size) { + if (ZEND_USER_CODE(my_function.type) && closure->func.common.scope != Z_OBJCE_P(newthis)) { my_function.op_array.run_time_cache = emalloc(my_function.op_array.cache_size); memset(my_function.op_array.run_time_cache, 0, my_function.op_array.cache_size); } @@ -206,7 +206,7 @@ ZEND_METHOD(Closure, bind) new_closure = (zend_closure *) Z_OBJ_P(return_value); /* Runtime cache relies on bound scope to be immutable, hence we need a separate rt cache in case scope changed */ - if (ZEND_USER_CODE(closure->func.type) && (closure->func.common.scope != new_closure->func.common.scope || (closure->func.op_array.fn_flags & ZEND_ACC_NO_RT_ARENA)) && new_closure->func.op_array.cache_size) { + if (ZEND_USER_CODE(closure->func.type) && (closure->func.common.scope != new_closure->func.common.scope || (closure->func.op_array.fn_flags & ZEND_ACC_NO_RT_ARENA))) { new_closure->func.op_array.run_time_cache = emalloc(new_closure->func.op_array.cache_size); memset(new_closure->func.op_array.run_time_cache, 0, new_closure->func.op_array.cache_size); @@ -543,7 +543,7 @@ ZEND_API void zend_create_closure(zval *res, zend_function *func, zend_class_ent zend_hash_init(closure->func.op_array.static_variables, zend_hash_num_elements(static_variables), NULL, ZVAL_PTR_DTOR, 0); zend_hash_apply_with_arguments(static_variables, zval_copy_static_var, 1, closure->func.op_array.static_variables); } - if (UNEXPECTED(!closure->func.op_array.run_time_cache) && func->op_array.cache_size) { + if (UNEXPECTED(!closure->func.op_array.run_time_cache)) { closure->func.op_array.run_time_cache = func->op_array.run_time_cache = zend_arena_alloc(&CG(arena), func->op_array.cache_size); memset(func->op_array.run_time_cache, 0, func->op_array.cache_size); } diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index dcf2d4a..67a6bc2 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -2166,7 +2166,7 @@ static zend_always_inline void i_init_func_execute_data(zend_execute_data *execu GC_REFCOUNT(Z_OBJ(EX(This)))++; } - if (UNEXPECTED(!op_array->run_time_cache) && op_array->cache_size) { + if (UNEXPECTED(!op_array->run_time_cache)) { op_array->run_time_cache = zend_arena_alloc(&CG(arena), op_array->cache_size); memset(op_array->run_time_cache, 0, op_array->cache_size); } @@ -2193,7 +2193,7 @@ static zend_always_inline void i_init_code_execute_data(zend_execute_data *execu GC_REFCOUNT(Z_OBJ(EX(This)))++; } - if (!op_array->run_time_cache && op_array->cache_size) { + if (!op_array->run_time_cache) { op_array->run_time_cache = emalloc(op_array->cache_size); memset(op_array->run_time_cache, 0, op_array->cache_size); }