From: paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Thu, 20 Aug 2015 10:18:03 +0000 (+0000)
Subject: /cp
X-Git-Tag: upstream/6.1~5146
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ddcdcdb752c1accf90fc11880206ca268d2f038a;p=platform%2Fupstream%2Flinaro-gcc.git

/cp
2015-08-20  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/67065
	* decl.c (grokvardecl): Reject 'main' as global variable.

/testsuite
2015-08-20  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/67065
	* g++.dg/other/pr67065.C: New.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@227027 138bc75d-0d04-0410-961f-82ee72b054a4
---

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  <paolo.carlini@oracle.com>
+
+	PR c++/67065
+	* decl.c (grokvardecl): Reject 'main' as global variable.
+
 2015-08-19  Jason Merrill  <jason@redhat.com>
 
 	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)
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index be33144..36a3d9e 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,6 +1,12 @@
+2015-08-20  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	PR c++/67065
+	* g++.dg/other/pr67065.C: New.
+
 2015-08-20  Simon Dardis  <simon.dardis@imgtec.com>
 
-	* gcc.target/mips/inline-memcpy-1.c: Test for inline expansion of memcpy.
+	* gcc.target/mips/inline-memcpy-1.c: Test for inline expansion of
+	memcpy.
 	* gcc.target/mips/inline-memcpy-2.c: Ditto.
 	* gcc.target/mips/inline-memcpy-3.c: Ditto.
 	* gcc.target/mips/inline-memcpy-4.c: Ditto.
diff --git a/gcc/testsuite/g++.dg/other/pr67065.C b/gcc/testsuite/g++.dg/other/pr67065.C
new file mode 100644
index 0000000..cbf03b2
--- /dev/null
+++ b/gcc/testsuite/g++.dg/other/pr67065.C
@@ -0,0 +1,3 @@
+// PR c++/67065
+
+int main;  // { dg-error "cannot declare" }