From e60be6bb45fdba8085bde5d1883deeae640e786b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= Date: Thu, 13 Oct 2022 21:46:30 +0200 Subject: [PATCH v3] c-family: Implicitly return zero from main even on freestanding ... unless marked noreturn. This should not get in anyone's way, but should permit the use of main() in freestanding more easily, especially for writing test cases that should work both in freestanding and hosted modes. gcc/c/ChangeLog: * c-decl.cc (finish_function): Ignore hosted when deciding whether to implicitly return zero, but check noreturn. * c-objc-common.cc (c_missing_noreturn_ok_p): Loosen the requirements to just MAIN_NAME_P. gcc/cp/ChangeLog: * cp-tree.h (DECL_MAIN_FREESTANDING_P): Move most DECL_MAIN_P logic here, so that we can use it when not hosted. (DECL_MAIN_P): Implement in terms of DECL_MAIN_FREESTANDING_P. * decl.cc (finish_function): Use DECL_MAIN_FREESTANDING_P instead of DECL_MAIN_P, to lose the hosted requirement, but check noreturn. gcc/testsuite/ChangeLog: * g++.dg/freestanding-main.C: New test. * gcc.dg/freestanding-main.c: New test. --- gcc/c/c-decl.cc | 2 +- gcc/c/c-objc-common.cc | 5 ++--- gcc/cp/cp-tree.h | 8 +++++--- gcc/cp/decl.cc | 3 ++- gcc/testsuite/g++.dg/freestanding-main.C | 5 +++++ gcc/testsuite/gcc.dg/freestanding-main.c | 5 +++++ 6 files changed, 20 insertions(+), 8 deletions(-) create mode 100644 gcc/testsuite/g++.dg/freestanding-main.C create mode 100644 gcc/testsuite/gcc.dg/freestanding-main.c diff --git a/gcc/c/c-decl.cc b/gcc/c/c-decl.cc index 193e268f04e..8c655590558 100644 --- a/gcc/c/c-decl.cc +++ b/gcc/c/c-decl.cc @@ -10442,7 +10442,7 @@ finish_function (location_t end_loc) if (DECL_RESULT (fndecl) && DECL_RESULT (fndecl) != error_mark_node) DECL_CONTEXT (DECL_RESULT (fndecl)) = fndecl; - if (MAIN_NAME_P (DECL_NAME (fndecl)) && flag_hosted + if (MAIN_NAME_P (DECL_NAME (fndecl)) && !TREE_THIS_VOLATILE (fndecl) && TYPE_MAIN_VARIANT (TREE_TYPE (TREE_TYPE (fndecl))) == integer_type_node && flag_isoc99) { diff --git a/gcc/c/c-objc-common.cc b/gcc/c/c-objc-common.cc index 70e10a98e33..2933414fd45 100644 --- a/gcc/c/c-objc-common.cc +++ b/gcc/c/c-objc-common.cc @@ -37,9 +37,8 @@ static bool c_tree_printer (pretty_printer *, text_info *, const char *, bool c_missing_noreturn_ok_p (tree decl) { - /* A missing noreturn is not ok for freestanding implementations and - ok for the `main' function in hosted implementations. */ - return flag_hosted && MAIN_NAME_P (DECL_ASSEMBLER_NAME (decl)); + /* A missing noreturn is ok for the `main' function. */ + return MAIN_NAME_P (DECL_ASSEMBLER_NAME (decl)); } /* Called from check_global_declaration. */ diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h index 3b67be651b9..4c7adfbffd8 100644 --- a/gcc/cp/cp-tree.h +++ b/gcc/cp/cp-tree.h @@ -772,11 +772,13 @@ typedef struct ptrmem_cst * ptrmem_cst_t; /* Returns nonzero iff NODE is a declaration for the global function `main'. */ -#define DECL_MAIN_P(NODE) \ +#define DECL_MAIN_FREESTANDING_P(NODE) \ (DECL_EXTERN_C_FUNCTION_P (NODE) \ && DECL_NAME (NODE) != NULL_TREE \ - && MAIN_NAME_P (DECL_NAME (NODE)) \ - && flag_hosted) + && MAIN_NAME_P (DECL_NAME (NODE))) + +/* Nonzero iff NODE is a declaration for `main', and we are hosted. */ +#define DECL_MAIN_P(NODE) (DECL_MAIN_FREESTANDING_P(NODE) && flag_hosted) /* Lookup walker marking. */ #define LOOKUP_SEEN_P(NODE) TREE_VISITED (NODE) diff --git a/gcc/cp/decl.cc b/gcc/cp/decl.cc index 82eb0c2f22a..cfc8cd5afd7 100644 --- a/gcc/cp/decl.cc +++ b/gcc/cp/decl.cc @@ -17854,7 +17854,8 @@ finish_function (bool inline_p) if (!DECL_CLONED_FUNCTION_P (fndecl)) { /* Make it so that `main' always returns 0 by default. */ - if (DECL_MAIN_P (current_function_decl)) + if (DECL_MAIN_FREESTANDING_P (current_function_decl) + && !TREE_THIS_VOLATILE (current_function_decl)) finish_return_stmt (integer_zero_node); if (use_eh_spec_block (current_function_decl)) diff --git a/gcc/testsuite/g++.dg/freestanding-main.C b/gcc/testsuite/g++.dg/freestanding-main.C new file mode 100644 index 00000000000..3718cc4508e --- /dev/null +++ b/gcc/testsuite/g++.dg/freestanding-main.C @@ -0,0 +1,5 @@ +/* Make sure we don't get a missing return warning on freestanding. */ +/* { dg-do compile } */ +/* { dg-options "-ffreestanding -Wreturn-type" } */ + +int main() {} diff --git a/gcc/testsuite/gcc.dg/freestanding-main.c b/gcc/testsuite/gcc.dg/freestanding-main.c new file mode 100644 index 00000000000..3718cc4508e --- /dev/null +++ b/gcc/testsuite/gcc.dg/freestanding-main.c @@ -0,0 +1,5 @@ +/* Make sure we don't get a missing return warning on freestanding. */ +/* { dg-do compile } */ +/* { dg-options "-ffreestanding -Wreturn-type" } */ + +int main() {} -- 2.38.0