Do not make Closures in const-expr toplevel

Author: TimWolla

Zend/zend_compile.c

@@ -8210,15 +8210,17 @@ static zend_string *zend_begin_func_decl(znode *result, zend_op_array *op_array,
 	zend_register_seen_symbol(lcname, ZEND_SYMBOL_FUNCTION);
 	if (!toplevel) {
 		uint32_t func_ref = zend_add_dynamic_func_def(op_array);
-		if (op_array->fn_flags & ZEND_ACC_CLOSURE) {
-			opline = zend_emit_op_tmp(result, ZEND_DECLARE_LAMBDA_FUNCTION, NULL, NULL);
-			opline->op2.num = func_ref;
-		} else {
-			opline = get_next_op();
-			opline->opcode = ZEND_DECLARE_FUNCTION;
-			opline->op1_type = IS_CONST;
-			LITERAL_STR(opline->op1, zend_string_copy(lcname));
-			opline->op2.num = func_ref;
+		if (decl->kind != ZEND_AST_OP_ARRAY) {
+			if (op_array->fn_flags & ZEND_ACC_CLOSURE) {
+				opline = zend_emit_op_tmp(result, ZEND_DECLARE_LAMBDA_FUNCTION, NULL, NULL);
+				opline->op2.num = func_ref;
+			} else {
+				opline = get_next_op();
+				opline->opcode = ZEND_DECLARE_FUNCTION;
+				opline->op1_type = IS_CONST;
+				LITERAL_STR(opline->op1, zend_string_copy(lcname));
+				opline->op2.num = func_ref;
+			}
 		}
 	}
 	return lcname;
@@ -8260,7 +8262,7 @@ static zend_op_array *zend_compile_func_decl_ex(
 		op_array->doc_comment = zend_string_copy(decl->doc_comment);
 	}
 
-	if (decl->kind == ZEND_AST_CLOSURE || decl->kind == ZEND_AST_ARROW_FUNC) {
+	if (decl->kind == ZEND_AST_CLOSURE || decl->kind == ZEND_AST_ARROW_FUNC || decl->kind == ZEND_AST_OP_ARRAY) {
 		op_array->fn_flags |= ZEND_ACC_CLOSURE;
 	}
 
@@ -11198,7 +11200,11 @@ static void zend_compile_const_expr_closure(zend_ast **ast_ptr)
 	}
 
 	znode node;
-	zend_op_array *op = zend_compile_func_decl(&node, *ast_ptr, 1);
+	zend_ast *ast = *ast_ptr;
+	zend_ast_kind old_kind = ast->kind;
+	ast->kind = ZEND_AST_OP_ARRAY;
+	zend_op_array *op = zend_compile_func_decl(&node, ast, /* toplevel */ false);
+	ast->kind = old_kind;
 
 	zend_ast_destroy(*ast_ptr);
 	zval z;