Revert "Fix phpGH-17715: Handle preloaded internal function runtime cache (php#17835)"

This reverts commit 53fa98e.

Author: kocsismate

Zend/zend_enum.c

@@ -418,10 +418,7 @@ static void zend_enum_register_func(zend_class_entry *ce, zend_known_string_id n
 	zif->module = EG(current_module);
 	zif->scope = ce;
 	zif->T = ZEND_OBSERVER_ENABLED;
-	if (EG(active)) { // at run-time
-		if (CG(compiler_options) & ZEND_COMPILE_PRELOAD) {
-			zif->fn_flags |= ZEND_ACC_PRELOADED;
-		}
+    if (EG(active)) { // at run-time
 		ZEND_MAP_PTR_INIT(zif->run_time_cache, zend_arena_calloc(&CG(arena), 1, zend_internal_run_time_cache_reserved_size()));
 	} else {
 #ifdef ZTS

Zend/zend_map_ptr.h

@@ -70,9 +70,6 @@ typedef struct _zend_string zend_string;
 	} while (0)
 # define ZEND_MAP_PTR_BIASED_BASE(real_base) \
 	((void*)(((uintptr_t)(real_base)) + zend_map_ptr_static_size * sizeof(void *) - 1))
-/* Note: chunked like: [8192..12287][4096..8191][0..4095] */
-#define ZEND_MAP_PTR_STATIC_NUM_TO_PTR(num) \
-	((void **)CG(map_ptr_real_base) + zend_map_ptr_static_size - ZEND_MM_ALIGNED_SIZE_EX((num) + 1, 4096) + ((num) & 4095))
 #else
 # error "Unknown ZEND_MAP_PTR_KIND"
 #endif

ext/opcache/ZendAccelerator.c

@@ -2627,7 +2627,6 @@ static void zend_reset_cache_vars(void)
 	ZCSG(restart_pending) = false;
 	ZCSG(force_restart_time) = 0;
 	ZCSG(map_ptr_last) = CG(map_ptr_last);
-	ZCSG(map_ptr_static_last) = zend_map_ptr_static_last;
 }
 
 static void accel_reset_pcre_cache(void)
@@ -2643,7 +2642,7 @@ static void accel_reset_pcre_cache(void)
 	} ZEND_HASH_FOREACH_END();
 }
 
-ZEND_RINIT_FUNCTION(zend_accelerator)
+zend_result accel_activate(INIT_FUNC_ARGS)
 {
 	if (!ZCG(enabled) || !accel_startup_ok) {
 		ZCG(accelerator_enabled) = false;
@@ -2949,13 +2948,12 @@ static void accel_globals_ctor(zend_accel_globals *accel_globals)
 	GC_MAKE_PERSISTENT_LOCAL(accel_globals->key);
 }
 
+#ifdef ZTS
 static void accel_globals_dtor(zend_accel_globals *accel_globals)
 {
 	zend_string_free(accel_globals->key);
-	if (accel_globals->preloaded_internal_run_time_cache) {
-		pefree(accel_globals->preloaded_internal_run_time_cache, 1);
-	}
 }
+#endif
 
 #ifdef HAVE_HUGE_CODE_PAGES
 # ifndef _WIN32
@@ -3445,8 +3443,6 @@ void accel_shutdown(void)
 	if (!ZCG(enabled) || !accel_startup_ok) {
 #ifdef ZTS
 		ts_free_id(accel_globals_id);
-#else
-		accel_globals_dtor(&accel_globals);
 #endif
 		return;
 	}
@@ -3463,8 +3459,6 @@ void accel_shutdown(void)
 
 #ifdef ZTS
 	ts_free_id(accel_globals_id);
-#else
-	accel_globals_dtor(&accel_globals);
 #endif
 
 	if (!_file_cache_only) {
@@ -4458,7 +4452,7 @@ static zend_persistent_script* preload_script_in_shared_memory(zend_persistent_s
 	return new_persistent_script;
 }
 
-static void preload_load(size_t orig_map_ptr_static_last)
+static void preload_load(void)
 {
 	/* Load into process tables */
 	zend_script *script = &ZCSG(preload_script)->script;
@@ -4493,42 +4487,14 @@ static void preload_load(size_t orig_map_ptr_static_last)
 	if (EG(class_table)) {
 		EG(persistent_classes_count)   = EG(class_table)->nNumUsed;
 	}
-
-	size_t old_map_ptr_last = CG(map_ptr_last);
-	if (zend_map_ptr_static_last != ZCSG(map_ptr_static_last) || old_map_ptr_last != ZCSG(map_ptr_last)) {
+	if (CG(map_ptr_last) != ZCSG(map_ptr_last)) {
+		size_t old_map_ptr_last = CG(map_ptr_last);
 		CG(map_ptr_last) = ZCSG(map_ptr_last);
-		CG(map_ptr_size) = ZEND_MM_ALIGNED_SIZE_EX(ZCSG(map_ptr_last) + 1, 4096);
-		zend_map_ptr_static_last = ZCSG(map_ptr_static_last);
-
-		/* Grow map_ptr table as needed, but allocate once for static + regular map_ptrs */
-		size_t new_static_size = ZEND_MM_ALIGNED_SIZE_EX(zend_map_ptr_static_last, 4096);
-		if (zend_map_ptr_static_size != new_static_size) {
-			void *new_base = pemalloc((new_static_size + CG(map_ptr_size)) * sizeof(void *), 1);
-			if (CG(map_ptr_real_base)) {
-				memcpy((void **) new_base + new_static_size - zend_map_ptr_static_size, CG(map_ptr_real_base), (old_map_ptr_last + zend_map_ptr_static_size) * sizeof(void *));
-				pefree(CG(map_ptr_real_base), 1);
-			}
-			CG(map_ptr_real_base) = new_base;
-			zend_map_ptr_static_size = new_static_size;
-		} else {
-			CG(map_ptr_real_base) = perealloc(CG(map_ptr_real_base), (zend_map_ptr_static_size + CG(map_ptr_size)) * sizeof(void *), 1);
-		}
-
-		memset((void **) CG(map_ptr_real_base) + zend_map_ptr_static_size + old_map_ptr_last, 0, (CG(map_ptr_last) - old_map_ptr_last) * sizeof(void *));
+		CG(map_ptr_size) = ZEND_MM_ALIGNED_SIZE_EX(CG(map_ptr_last) + 1, 4096);
+		CG(map_ptr_real_base) = perealloc(CG(map_ptr_real_base), CG(map_ptr_size) * sizeof(void*), 1);
 		CG(map_ptr_base) = ZEND_MAP_PTR_BIASED_BASE(CG(map_ptr_real_base));
-	}
-
-	if (orig_map_ptr_static_last != zend_map_ptr_static_last) {
-		/* preloaded static entries currently are all runtime cache pointers, just assign them as such */
-		size_t runtime_cache_size = zend_internal_run_time_cache_reserved_size();
-		ZCG(preloaded_internal_run_time_cache_size) = (zend_map_ptr_static_last - orig_map_ptr_static_last) * runtime_cache_size;
-		char *cache = pemalloc(ZCG(preloaded_internal_run_time_cache_size), 1);
-		ZCG(preloaded_internal_run_time_cache) = cache;
-
-		for (size_t cur_static_map_ptr = orig_map_ptr_static_last; cur_static_map_ptr < zend_map_ptr_static_last; ++cur_static_map_ptr) {
-            *ZEND_MAP_PTR_STATIC_NUM_TO_PTR(cur_static_map_ptr) = cache;
-			cache += runtime_cache_size;
-		}
+		memset((void **) CG(map_ptr_real_base) + old_map_ptr_last, 0,
+			(CG(map_ptr_last) - old_map_ptr_last) * sizeof(void *));
 	}
 }
 
@@ -4570,7 +4536,7 @@ static zend_result accel_preload(const char *config, bool in_child)
 	zend_file_handle file_handle;
 	zend_result ret;
 	char *orig_open_basedir;
-	size_t orig_map_ptr_last, orig_map_ptr_static_last;
+	size_t orig_map_ptr_last;
 	uint32_t orig_compiler_options;
 
 	ZCG(enabled) = false;
@@ -4581,7 +4547,6 @@ static zend_result accel_preload(const char *config, bool in_child)
 	accelerator_orig_compile_file = preload_compile_file;
 
 	orig_map_ptr_last = CG(map_ptr_last);
-	orig_map_ptr_static_last = zend_map_ptr_static_last;
 
 	/* Compile and execute preloading script */
 	zend_stream_init_filename(&file_handle, (char *) config);
@@ -4761,7 +4726,7 @@ static zend_result accel_preload(const char *config, bool in_child)
 		SHM_PROTECT();
 		HANDLE_UNBLOCK_INTERRUPTIONS();
 
-		preload_load(orig_map_ptr_static_last);
+		preload_load();
 
 		/* Store individual scripts with unlinked classes */
 		HANDLE_BLOCK_INTERRUPTIONS();
@@ -5034,7 +4999,7 @@ static zend_result accel_finish_startup(void)
 
 	if (ZCSG(preload_script)) {
 		/* Preloading was done in another process */
-		preload_load(zend_map_ptr_static_last);
+		preload_load();
 		zend_shared_alloc_unlock();
 		return SUCCESS;
 	}
@@ -5062,7 +5027,7 @@ static zend_result accel_finish_startup(void)
 		}
 
 		if (ZCSG(preload_script)) {
-			preload_load(zend_map_ptr_static_last);
+			preload_load();
 		}
 
 		zend_shared_alloc_unlock();
@@ -5076,12 +5041,6 @@ static zend_result accel_finish_startup(void)
 #endif /* ZEND_WIN32 */
 }
 
-static void accel_activate(void) {
-	if (ZCG(preloaded_internal_run_time_cache)) {
-		memset(ZCG(preloaded_internal_run_time_cache), 0, ZCG(preloaded_internal_run_time_cache_size));
-	}
-}
-
 static zend_extension opcache_extension_entry = {
 	ACCELERATOR_PRODUCT_NAME,               /* name */
 	PHP_VERSION,							/* version */
@@ -5090,7 +5049,7 @@ static zend_extension opcache_extension_entry = {
 	"Copyright (c)",						/* copyright */
 	accel_startup,					   		/* startup */
 	NULL,									/* shutdown */
-	accel_activate,							/* per-script activation */
+	NULL,									/* per-script activation */
 #ifdef HAVE_JIT
 	accel_deactivate,                       /* per-script deactivation */
 #else

ext/opcache/ZendAccelerator.h

@@ -218,8 +218,6 @@ typedef struct _zend_accel_globals {
 #ifndef ZEND_WIN32
 	zend_ulong              root_hash;
 #endif
-	void                   *preloaded_internal_run_time_cache;
-	size_t                  preloaded_internal_run_time_cache_size;
 	bool                    preloading;
 	/* preallocated shared-memory block to save current script */
 	void                   *mem;
@@ -301,9 +299,11 @@ extern zend_accel_shared_globals *accel_shared_globals;
 #define ZCSG(element)   (accel_shared_globals->element)
 
 #ifdef ZTS
-# define ZCG(v)	ZEND_TSRMG_FAST(accel_globals_offset, zend_accel_globals *, v)
+# define ZCG(v)	ZEND_TSRMG(accel_globals_id, zend_accel_globals *, v)
 extern int accel_globals_id;
-extern size_t accel_globals_offset;
+# ifdef COMPILE_DL_OPCACHE
+ZEND_TSRMLS_CACHE_EXTERN()
+# endif
 #else
 # define ZCG(v) (accel_globals.v)
 extern zend_accel_globals accel_globals;

ext/opcache/tests/preload_enum_observed.phpt

@@ -596,7 +596,7 @@ zend_module_entry opcache_module_entry = {
 	ext_functions,
 	ZEND_MINIT(zend_accelerator),
 	ZEND_MSHUTDOWN(zend_accelerator),
-	ZEND_RINIT(zend_accelerator),
+	NULL,
 	NULL,
 	zend_accel_info,
 	PHP_VERSION,

ext/opcache/zend_accelerator_module.c

@@ -759,11 +759,7 @@ static zend_op_array *zend_persist_class_method(zend_op_array *op_array, zend_cl
 				// Real dynamically created internal functions like enum methods must have their own run_time_cache pointer. They're always on the same scope as their defining class.
 				// However, copies - as caused by inheritance of internal methods - must retain the original run_time_cache pointer, shared with the source function.
 				if (!op_array->scope || (op_array->scope == ce && !(op_array->fn_flags & ZEND_ACC_TRAIT_CLONE))) {
-					if (op_array->fn_flags & ZEND_ACC_PRELOADED) {
-						ZEND_MAP_PTR_NEW_STATIC(op_array->run_time_cache);
-					} else {
-						ZEND_MAP_PTR_NEW(op_array->run_time_cache);
-					}
+					ZEND_MAP_PTR_NEW(op_array->run_time_cache);
 				}
 			}
 		}
@@ -1480,7 +1476,6 @@ zend_persistent_script *zend_accel_script_persist(zend_persistent_script *script
 
 	if (for_shm) {
 		ZCSG(map_ptr_last) = CG(map_ptr_last);
-		ZCSG(map_ptr_static_last) = zend_map_ptr_static_last;
 	}
 
 #ifdef HAVE_JIT