diff options
Diffstat (limited to 'ext/opcache/zend_persist.c')
| -rw-r--r-- | ext/opcache/zend_persist.c | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/ext/opcache/zend_persist.c b/ext/opcache/zend_persist.c index ed05872993..39e5d5fa88 100644 --- a/ext/opcache/zend_persist.c +++ b/ext/opcache/zend_persist.c @@ -29,6 +29,10 @@ #include "zend_operators.h" #include "zend_interfaces.h" +#ifdef HAVE_JIT +# include "jit/zend_jit.h" +#endif + #define zend_set_str_gc_flags(str) do { \ if (file_cache_only) { \ GC_TYPE_INFO(str) = IS_STRING | (IS_STR_INTERNED << GC_FLAGS_SHIFT); \ @@ -627,6 +631,13 @@ static void zend_persist_op_array_ex(zend_op_array *op_array, zend_persistent_sc } ZCG(mem) = (void*)((char*)ZCG(mem) + ZEND_ALIGNED_SIZE(zend_extensions_op_array_persist(op_array, ZCG(mem)))); + +#ifdef HAVE_JIT + if (ZCG(accel_directives).jit && + ZEND_JIT_LEVEL(ZCG(accel_directives).jit) <= ZEND_JIT_LEVEL_OPT_FUNCS) { + zend_jit_op_array(op_array, ZCG(current_persistent_script) ? &ZCG(current_persistent_script)->script : NULL); + } +#endif } static void zend_persist_op_array(zval *zv) @@ -1107,6 +1118,10 @@ static void zend_accel_persist_class_table(HashTable *class_table) zend_persistent_script *zend_accel_script_persist(zend_persistent_script *script, const char **key, unsigned int key_length, int for_shm) { +#ifdef HAVE_JIT + zend_long orig_jit = 0; +#endif + script->mem = ZCG(mem); ZEND_ASSERT(((zend_uintptr_t)ZCG(mem) & 0x7) == 0); /* should be 8 byte aligned */ @@ -1136,6 +1151,17 @@ zend_persistent_script *zend_accel_script_persist(zend_persistent_script *script script->arena_mem = ZCG(arena_mem) = ZCG(mem); ZCG(mem) = (void*)((char*)ZCG(mem) + script->arena_size); +#ifdef HAVE_JIT + if (ZCG(accel_directives).jit) { + if (key) { + zend_jit_unprotect(); + } else { + orig_jit = ZCG(accel_directives).jit; + ZCG(accel_directives).jit = 0; + } + } +#endif + zend_map_ptr_extend(ZCSG(map_ptr_last)); zend_accel_persist_class_table(&script->script.class_table); @@ -1144,6 +1170,17 @@ zend_persistent_script *zend_accel_script_persist(zend_persistent_script *script ZCSG(map_ptr_last) = CG(map_ptr_last); +#ifdef HAVE_JIT + if (ZCG(accel_directives).jit) { + if (ZEND_JIT_LEVEL(ZCG(accel_directives).jit) >= ZEND_JIT_LEVEL_OPT_SCRIPT) { + zend_jit_script(&script->script); + } + zend_jit_protect(); + } else if (!key) { + ZCG(accel_directives).jit = orig_jit; + } +#endif + script->corrupted = 0; ZCG(current_persistent_script) = NULL; |