summaryrefslogtreecommitdiff
path: root/Zend/zend_execute.c
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@zend.com>2018-10-17 15:52:50 +0300
committerDmitry Stogov <dmitry@zend.com>2018-10-17 15:52:50 +0300
commitd57cd36e47b627dee5b825760163f8e62e23ab28 (patch)
tree250b3c1176663a2030d68f20a5f485e44aacf71d /Zend/zend_execute.c
parentad6738e886cbeb69dcd440ecc88727feaaccbe78 (diff)
downloadphp-git-d57cd36e47b627dee5b825760163f8e62e23ab28.tar.gz
Immutable clases and op_arrays.
Squashed commit of the following: commit cd0c36c3f943849e5b97a8dbe2dd029fbeab3df9 Merge: 4740dabb84 ad6738e886 Author: Dmitry Stogov <dmitry@zend.com> Date: Wed Oct 17 14:43:38 2018 +0300 Merge branch 'master' into immutable * master: Remove the "auto" encoding Fixed bug #77025 Add vtbls for EUC-TW encoding commit 4740dabb843c6d4f7f866b4a2456073c9eaf4c77 Author: Dmitry Stogov <dmitry@zend.com> Date: Wed Oct 17 14:12:28 2018 +0300 Reverted back ce->iterator_funcs_ptr. Initialize ce->iterator_funcs_ptr fields in immutable classes. commit ad7a78b253be970db70c2251e66f9297d8e7f829 Author: Dmitry Stogov <dmitry@zend.com> Date: Wed Oct 17 11:46:30 2018 +0300 Added comment commit 0276ea51875bab37be01a4dc5e5a047c5698c571 Author: Dmitry Stogov <dmitry@zend.com> Date: Wed Oct 17 11:42:43 2018 +0300 Added type cast commit c63fc5d5f19c58498108d1698055b2b442227eb3 Author: Dmitry Stogov <dmitry@zend.com> Date: Wed Oct 17 11:36:51 2018 +0300 Moved static class members initialization into the proper place. commit b945548e9306b1826c881918858b5e5aa3eb3002 Author: Dmitry Stogov <dmitry@zend.com> Date: Wed Oct 17 11:21:03 2018 +0300 Removed redundand assertion commit d5a41088401814c829847db212488f8aae39bcd2 Author: Dmitry Stogov <dmitry@zend.com> Date: Wed Oct 17 11:19:13 2018 +0300 Removed duplicate code commit 8dadca8864e66de70a24bdf1181bcf7dd8fb27d7 Author: Dmitry Stogov <dmitry@zend.com> Date: Wed Oct 17 11:05:43 2018 +0300 Hide offset encoding magic in ZEND_MAP_PTR_IS_OFFSET(), ZEND_MAP_PTR_OFFSET2PTR() and ZEND_MAP_PTR_PTR2OFFSET() macros. commit 9ef07c88bd76801e2d4fbfeab3ebfd6e6a67ac5f Author: Dmitry Stogov <dmitry@zend.com> Date: Wed Oct 17 10:48:29 2018 +0300 typo commit a06f0f3d3aba53e766046221ee44fb9720389ecc Merge: 94099586ec 3412345ffe Author: Dmitry Stogov <dmitry@zend.com> Date: Wed Oct 17 10:47:07 2018 +0300 Merge branch 'master' into immutable * master: Remove unused variable makefile_am_files Classify object handlers are required/optional Add support for getting SKIP_TAGSTART and SKIP_WHITE options Remove some obsolete config_vars.mk occurrences Remove bsd_converted from .gitignore Remove configuration parser and scanners ignores Remove obsolete buildconf.stamp from .gitignore [ci skip] Add magicdata.patch exception to .gitignore Remove outdated ext/spl/examples items from .gitignore Remove unused test.inc in ext/iconv/tests commit 94099586ec599117581ca01c15b1f6c5f749e23a Author: Dmitry Stogov <dmitry@zend.com> Date: Mon Oct 15 23:34:01 2018 +0300 Immutable clases and op_arrays
Diffstat (limited to 'Zend/zend_execute.c')
-rw-r--r--Zend/zend_execute.c71
1 files changed, 26 insertions, 45 deletions
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
index 66ff7abfcd..6cf75d0926 100644
--- a/Zend/zend_execute.c
+++ b/Zend/zend_execute.c
@@ -2407,39 +2407,20 @@ static zend_always_inline void i_init_func_execute_data(zend_op_array *op_array,
}
/* }}} */
-static zend_never_inline void ZEND_FASTCALL init_func_run_time_cache(zend_op_array *op_array) /* {{{ */
+static zend_always_inline void init_func_run_time_cache_i(zend_op_array *op_array) /* {{{ */
{
- ZEND_ASSERT(op_array->run_time_cache == NULL);
- 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);
-}
-/* }}} */
+ void **run_time_cache;
-static zend_always_inline zend_function* ZEND_FASTCALL init_func_run_time_cache_i(zval *zv) /* {{{ */
-{
- zend_op_array *op_array = Z_PTR_P(zv);
-
- ZEND_ASSERT(op_array->run_time_cache == NULL);
- if (op_array->fn_flags & ZEND_ACC_IMMUTABLE) {
- zend_op_array *new_op_array = zend_arena_alloc(&CG(arena), sizeof(zend_op_array) + op_array->cache_size);
-
- Z_PTR_P(zv) = new_op_array;
- memcpy(new_op_array, op_array, sizeof(zend_op_array));
- new_op_array->fn_flags &= ~ZEND_ACC_IMMUTABLE;
- new_op_array->run_time_cache = (void**)(new_op_array + 1);
- memset(new_op_array->run_time_cache, 0, new_op_array->cache_size);
- return (zend_function*)new_op_array;
- } else {
- 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);
- return (zend_function*)op_array;
- }
+ ZEND_ASSERT(RUN_TIME_CACHE(op_array) == NULL);
+ run_time_cache = zend_arena_alloc(&CG(arena), op_array->cache_size);
+ memset(run_time_cache, 0, op_array->cache_size);
+ ZEND_MAP_PTR_SET(op_array->run_time_cache, run_time_cache);
}
/* }}} */
-static zend_never_inline zend_function* init_func_run_time_cache_ex(zval *zv) /* {{{ */
+static zend_never_inline void ZEND_FASTCALL init_func_run_time_cache(zend_op_array *op_array) /* {{{ */
{
- return init_func_run_time_cache_i(zv);
+ init_func_run_time_cache_i(op_array);
}
/* }}} */
@@ -2450,8 +2431,8 @@ ZEND_API zend_function * ZEND_FASTCALL zend_fetch_function(zend_string *name) /*
if (EXPECTED(zv != NULL)) {
zend_function *fbc = Z_FUNC_P(zv);
- if (EXPECTED(fbc->type == ZEND_USER_FUNCTION) && UNEXPECTED(!fbc->op_array.run_time_cache)) {
- fbc = (zend_function*)init_func_run_time_cache_i(zv);
+ if (EXPECTED(fbc->type == ZEND_USER_FUNCTION) && UNEXPECTED(!RUN_TIME_CACHE(&fbc->op_array))) {
+ init_func_run_time_cache_i(&fbc->op_array);
}
return fbc;
}
@@ -2465,8 +2446,8 @@ ZEND_API zend_function * ZEND_FASTCALL zend_fetch_function_str(const char *name,
if (EXPECTED(zv != NULL)) {
zend_function *fbc = Z_FUNC_P(zv);
- if (EXPECTED(fbc->type == ZEND_USER_FUNCTION) && UNEXPECTED(!fbc->op_array.run_time_cache)) {
- fbc = (zend_function*)init_func_run_time_cache_i(zv);
+ if (EXPECTED(fbc->type == ZEND_USER_FUNCTION) && UNEXPECTED(!RUN_TIME_CACHE(&fbc->op_array))) {
+ init_func_run_time_cache_i(&fbc->op_array);
}
return fbc;
}
@@ -2483,10 +2464,15 @@ static zend_always_inline void i_init_code_execute_data(zend_execute_data *execu
zend_attach_symbol_table(execute_data);
- if (!op_array->run_time_cache) {
+ if (!ZEND_MAP_PTR(op_array->run_time_cache)) {
+ void *ptr;
+
ZEND_ASSERT(op_array->fn_flags & ZEND_ACC_HEAP_RT_CACHE);
- op_array->run_time_cache = emalloc(op_array->cache_size);
- memset(op_array->run_time_cache, 0, op_array->cache_size);
+ ptr = emalloc(op_array->cache_size + sizeof(void*));
+ ZEND_MAP_PTR_INIT(op_array->run_time_cache, ptr);
+ ptr = (char*)ptr + sizeof(void*);
+ ZEND_MAP_PTR_SET(op_array->run_time_cache, ptr);
+ memset(ptr, 0, op_array->cache_size);
}
EX_LOAD_RUN_TIME_CACHE(op_array);
@@ -2505,7 +2491,7 @@ ZEND_API void zend_init_func_execute_data(zend_execute_data *ex, zend_op_array *
#endif
EX(prev_execute_data) = EG(current_execute_data);
- if (!op_array->run_time_cache) {
+ if (!RUN_TIME_CACHE(op_array)) {
init_func_run_time_cache(op_array);
}
i_init_func_execute_data(op_array, return_value, 1 EXECUTE_DATA_CC);
@@ -2521,11 +2507,6 @@ ZEND_API void zend_init_func_execute_data(zend_execute_data *ex, zend_op_array *
ZEND_API void zend_init_code_execute_data(zend_execute_data *execute_data, zend_op_array *op_array, zval *return_value) /* {{{ */
{
EX(prev_execute_data) = EG(current_execute_data);
- if (!op_array->run_time_cache) {
- ZEND_ASSERT(op_array->fn_flags & ZEND_ACC_HEAP_RT_CACHE);
- op_array->run_time_cache = emalloc(op_array->cache_size);
- memset(op_array->run_time_cache, 0, op_array->cache_size);
- }
i_init_code_execute_data(execute_data, op_array, return_value);
}
/* }}} */
@@ -2867,7 +2848,7 @@ static zend_never_inline zend_execute_data *zend_init_dynamic_call_string(zend_s
return NULL;
}
}
- if (EXPECTED(fbc->type == ZEND_USER_FUNCTION) && UNEXPECTED(!fbc->op_array.run_time_cache)) {
+ if (EXPECTED(fbc->type == ZEND_USER_FUNCTION) && UNEXPECTED(!RUN_TIME_CACHE(&fbc->op_array))) {
init_func_run_time_cache(&fbc->op_array);
}
} else {
@@ -2885,8 +2866,8 @@ static zend_never_inline zend_execute_data *zend_init_dynamic_call_string(zend_s
zend_string_release_ex(lcname, 0);
fbc = Z_FUNC_P(func);
- if (EXPECTED(fbc->type == ZEND_USER_FUNCTION) && UNEXPECTED(!fbc->op_array.run_time_cache)) {
- fbc = init_func_run_time_cache_ex(func);
+ if (EXPECTED(fbc->type == ZEND_USER_FUNCTION) && UNEXPECTED(!RUN_TIME_CACHE(&fbc->op_array))) {
+ init_func_run_time_cache(&fbc->op_array);
}
called_scope = NULL;
}
@@ -2922,7 +2903,7 @@ static zend_never_inline zend_execute_data *zend_init_dynamic_call_object(zval *
return NULL;
}
- if (EXPECTED(fbc->type == ZEND_USER_FUNCTION) && UNEXPECTED(!fbc->op_array.run_time_cache)) {
+ if (EXPECTED(fbc->type == ZEND_USER_FUNCTION) && UNEXPECTED(!RUN_TIME_CACHE(&fbc->op_array))) {
init_func_run_time_cache(&fbc->op_array);
}
@@ -3009,7 +2990,7 @@ static zend_never_inline zend_execute_data *zend_init_dynamic_call_array(zend_ar
return NULL;
}
- if (EXPECTED(fbc->type == ZEND_USER_FUNCTION) && UNEXPECTED(!fbc->op_array.run_time_cache)) {
+ if (EXPECTED(fbc->type == ZEND_USER_FUNCTION) && UNEXPECTED(!RUN_TIME_CACHE(&fbc->op_array))) {
init_func_run_time_cache(&fbc->op_array);
}