Fix ZEND_API mismatch on zend_ce_closure forward decl for Windows+Clang

henderkes · iluuu1994 · commit 35258957cd1d · 2026-03-27T14:43:22.000+01:00
Closes phpGH-21547
diff --git a/NEWS b/NEWS
@@ -5,6 +5,8 @@ PHP                                                                        NEWS
 - Core:
   . Fixed bug GH-19983 (GC assertion failure with fibers, generators and
     destructors). (iliaal)
+  . Fixed ZEND_API mismatch on zend_ce_closure forward decl for Windows+Clang.
+    (henderkes)
 
 - SPL:
   . Fixed bug GH-21499 (RecursiveArrayIterator getChildren UAF after parent
diff --git a/Zend/zend_execute.h b/Zend/zend_execute.h
@@ -248,7 +248,7 @@ static zend_always_inline void zend_cast_zval_to_object(zval *result, zval *expr
 }
 
 static zend_always_inline void zend_cast_zval_to_array(zval *result, zval *expr, uint8_t op1_type) {
-	extern zend_class_entry *zend_ce_closure;
+	extern ZEND_API zend_class_entry *zend_ce_closure;
 	if (op1_type == IS_CONST || Z_TYPE_P(expr) != IS_OBJECT || Z_OBJCE_P(expr) == zend_ce_closure) {
 		if (Z_TYPE_P(expr) != IS_NULL) {
 			if (UNEXPECTED(Z_TYPE_P(expr) == IS_DOUBLE && zend_isnan(Z_DVAL_P(expr)))) {

Original file line number	Diff line number	Diff line change
`@@ -248,7 +248,7 @@ static zend_always_inline void zend_cast_zval_to_object(zval result, zval expr`
`248`	`248`	`}`
`249`	`249`
`250`	`250`	`static zend_always_inline void zend_cast_zval_to_array(zval result, zval expr, uint8_t op1_type) {`
`251`		`- extern zend_class_entry *zend_ce_closure;`
	`251`	`+ extern ZEND_API zend_class_entry *zend_ce_closure;`
`252`	`252`	`if (op1_type == IS_CONST \|\| Z_TYPE_P(expr) != IS_OBJECT \|\| Z_OBJCE_P(expr) == zend_ce_closure) {`
`253`	`253`	`if (Z_TYPE_P(expr) != IS_NULL) {`
`254`	`254`	`if (UNEXPECTED(Z_TYPE_P(expr) == IS_DOUBLE && zend_isnan(Z_DVAL_P(expr)))) {`