From dfd71aba57811c28d21a49909d9c6b96f5ae05ea Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Thu, 20 Aug 2015 10:18:03 +0000 Subject: re PR c++/67065 ([DR 1886] Missing diagnostics for ill-formed program with main variable instead of function) /cp 2015-08-20 Paolo Carlini PR c++/67065 * decl.c (grokvardecl): Reject 'main' as global variable. /testsuite 2015-08-20 Paolo Carlini PR c++/67065 * g++.dg/other/pr67065.C: New. From-SVN: r227027 --- gcc/cp/ChangeLog | 5 +++++ gcc/cp/decl.c | 5 +++++ 2 files changed, 10 insertions(+) (limited to 'gcc/cp') diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 2a083c8..53d4feb 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2015-08-20 Paolo Carlini + + PR c++/67065 + * decl.c (grokvardecl): Reject 'main' as global variable. + 2015-08-19 Jason Merrill PR c++/66957 diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 5c75972..4f77e7c 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -8355,6 +8355,11 @@ grokvardecl (tree type, else DECL_INTERFACE_KNOWN (decl) = 1; + if (DECL_NAME (decl) + && MAIN_NAME_P (DECL_NAME (decl)) + && CP_DECL_CONTEXT (decl) == global_namespace) + error ("cannot declare %<::main%> to be a global variable"); + /* Check that the variable can be safely declared as a concept. Note that this also forbids explicit specializations. */ if (conceptp) -- cgit v1.1