Dummy

Author: TimWolla

Zend/zend_compile.c

@@ -8138,10 +8138,9 @@ static uint32_t zend_add_dynamic_func_def(zend_op_array *def) {
 	return def_offset;
 }
 
-static zend_string *zend_begin_func_decl(znode *result, zend_op_array *op_array, zend_ast_decl *decl, bool toplevel) /* {{{ */
+static zend_string *zend_begin_func_decl(zend_op_array *op_array, zend_ast_decl *decl) /* {{{ */
 {
 	zend_string *unqualified_name, *name, *lcname;
-	zend_op *opline;
 
 	if (op_array->fn_flags & ZEND_ACC_CLOSURE) {
 		zend_string *filename = op_array->filename;
@@ -8208,19 +8207,7 @@ 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;
-		}
-	}
+
 	return lcname;
 }
 /* }}} */
@@ -8269,10 +8256,29 @@ static zend_op_array *zend_compile_func_decl_ex(
 		op_array->scope = ce;
 		op_array->function_name = zend_string_copy(decl->name);
 	} else if (is_method) {
+		ZEND_ASSERT(!toplevel);
 		bool has_body = stmt_ast != NULL;
 		lcname = zend_begin_method_decl(op_array, decl->name, has_body);
 	} else {
-		lcname = zend_begin_func_decl(result, op_array, decl, toplevel);
+		lcname = zend_begin_func_decl(op_array, decl);
+		if (toplevel) {
+			op_array->fn_flags |= ZEND_ACC_TOP_LEVEL;
+		} else {
+			zend_op *opline;
+
+			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_ARROW_FUNC) {
 			find_implicit_binds(&info, params_ast, stmt_ast);
 			compile_implicit_lexical_binds(&info, result, op_array);
@@ -8320,10 +8326,6 @@ static zend_op_array *zend_compile_func_decl_ex(
 		CG(active_class_entry) = NULL;
 	}
 
-	if (toplevel) {
-		op_array->fn_flags |= ZEND_ACC_TOP_LEVEL;
-	}
-
 	zend_oparray_context_begin(&orig_oparray_context, op_array);
 	CG(context).active_property_info = property_info;
 	CG(context).active_property_hook_kind = hook_kind;