php
diff --git a/‎NEWS‎
Lines changed: 3 additions & 0 deletions b/‎NEWS‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎Zend/zend.c‎
Lines changed: 9 additions & 1 deletion b/‎Zend/zend.c‎
Lines changed: 9 additions & 1 deletion
diff --git a/‎Zend/zend_execute_API.c‎
Lines changed: 43 additions & 0 deletions b/‎Zend/zend_execute_API.c‎
Lines changed: 43 additions & 0 deletions
diff --git a/‎Zend/zend_opcode.c‎
Lines changed: 3 additions & 1 deletion b/‎Zend/zend_opcode.c‎
Lines changed: 3 additions & 1 deletion
@@ -22,6 +22,9 @@ PHP                                                                        NEWS
   . Changed default of $variant parameter of idn_to_ascii() and idn_to_utf8().
     (cmb)
 
+- Opcache:
+  . Implemented preloading RFC: https://wiki.php.net/rfc/preload. (Dmitry)
+
 - PDO_OCI:
   . Implemented FR #76908 (PDO_OCI getColumnMeta() not implemented).
     (Valentin Collet, Chris Jones, Remi)
 
@@ -566,8 +566,13 @@ static void auto_global_dtor(zval *zv) /* {{{ */
 static void function_copy_ctor(zval *zv) /* {{{ */
 {
 	zend_function *old_func = Z_FUNC_P(zv);
-	zend_function *func = pemalloc(sizeof(zend_internal_function), 1);
+	zend_function *func;
 
+	if (old_func->type == ZEND_USER_FUNCTION) {
+		ZEND_ASSERT(old_func->op_array.fn_flags & ZEND_ACC_IMMUTABLE);
+		return;
+	}
+	func = pemalloc(sizeof(zend_internal_function), 1);
 	Z_FUNC_P(zv) = func;
 	memcpy(func, old_func, sizeof(zend_internal_function));
 	function_add_ref(func);
@@ -977,14 +982,17 @@ int zend_post_startup(void) /* {{{ */
 
 	zend_destroy_rsrc_list(&EG(persistent_list));
 	free(compiler_globals->function_table);
+	compiler_globals->function_table = NULL;
 	free(compiler_globals->class_table);
+	compiler_globals->class_table = NULL;
 	if ((script_encoding_list = (zend_encoding **)compiler_globals->script_encoding_list)) {
 		compiler_globals_ctor(compiler_globals);
 		compiler_globals->script_encoding_list = (const zend_encoding **)script_encoding_list;
 	} else {
 		compiler_globals_ctor(compiler_globals);
 	}
 	free(EG(zend_constants));
+	EG(zend_constants) = NULL;
 
 	executor_globals_ctor(executor_globals);
 	global_persistent_list = &EG(persistent_list);
 
@@ -340,13 +340,56 @@ void shutdown_executor(void) /* {{{ */
 				destroy_op_array(&func->op_array);
 				zend_string_release_ex(key, 0);
 			} ZEND_HASH_FOREACH_END_DEL();
+
+			/* Cleanup preloaded immutable functions */
+			ZEND_HASH_REVERSE_FOREACH_VAL(EG(function_table), zv) {
+				zend_op_array *op_array = Z_PTR_P(zv);
+				if (op_array->type == ZEND_INTERNAL_FUNCTION) {
+					break;
+				}
+				ZEND_ASSERT(op_array->fn_flags & ZEND_ACC_IMMUTABLE);
+				if (op_array->static_variables) {
+					HashTable *ht = ZEND_MAP_PTR_GET(op_array->static_variables_ptr);
+					if (ht) {
+						ZEND_ASSERT(GC_REFCOUNT(ht) == 1);
+						zend_array_destroy(ht);
+					}
+				}
+			} ZEND_HASH_FOREACH_END();
+
 			ZEND_HASH_REVERSE_FOREACH_STR_KEY_VAL(EG(class_table), key, zv) {
 				if (_idx == EG(persistent_classes_count)) {
 					break;
 				}
 				destroy_zend_class(zv);
 				zend_string_release_ex(key, 0);
 			} ZEND_HASH_FOREACH_END_DEL();
+
+			/* Cleanup preloaded immutable classes */
+			ZEND_HASH_REVERSE_FOREACH_VAL(EG(class_table), zv) {
+				zend_class_entry *ce = Z_PTR_P(zv);
+				if (ce->type == ZEND_INTERNAL_CLASS) {
+					break;
+				}
+				ZEND_ASSERT(ce->ce_flags & ZEND_ACC_IMMUTABLE);
+				if (ce->default_static_members_count) {
+					zend_cleanup_internal_class_data(ce);
+				}
+				if (ce->ce_flags & ZEND_HAS_STATIC_IN_METHODS) {
+					zend_op_array *op_array;
+						ZEND_HASH_FOREACH_PTR(&ce->function_table, op_array) {
+						if (op_array->type == ZEND_USER_FUNCTION) {
+							if (op_array->static_variables) {
+								HashTable *ht = ZEND_MAP_PTR_GET(op_array->static_variables_ptr);
+								if (ht) {
+									ZEND_ASSERT(GC_REFCOUNT(ht) == 1);
+									zend_array_destroy(ht);
+								}
+							}
+						}
+					} ZEND_HASH_FOREACH_END();
+				}
+			} ZEND_HASH_FOREACH_END();
 		}
 
 		zend_cleanup_internal_classes();
 
@@ -362,7 +362,9 @@ void zend_class_add_ref(zval *zv)
 {
 	zend_class_entry *ce = Z_PTR_P(zv);
 
-	ce->refcount++;
+	if (!(ce->ce_flags & ZEND_ACC_IMMUTABLE)) {
+		ce->refcount++;
+	}
 }
 
 ZEND_API void destroy_op_array(zend_op_array *op_array)
Original file line number	Diff line number	Diff line change
`@@ -362,7 +362,9 @@ void zend_class_add_ref(zval *zv)`
`362`	`362`	`{`
`363`	`363`	`zend_class_entry *ce = Z_PTR_P(zv);`
`364`	`364`
`365`		`- ce->refcount++;`
	`365`	`+ if (!(ce->ce_flags & ZEND_ACC_IMMUTABLE)) {`
	`366`	`+ ce->refcount++;`
	`367`	`+ }`
`366`	`368`	`}`
`367`	`369`
`368`	`370`	`ZEND_API void destroy_op_array(zend_op_array *op_array)`