Added support for preloaded classes/functions in ZTS build

dstogov · dstogov · commit ab9a40f63cfa · 2018-10-25T20:52:51.000+03:00
diff --git a/Zend/zend.c b/Zend/zend.c
@@ -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);
diff --git a/Zend/zend_opcode.c b/Zend/zend_opcode.c
@@ -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)`