diff options
| author | Paolo Carlini <paolo.carlini@oracle.com> | 2015-08-21 14:44:33 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2015-08-21 14:44:33 +0000 |
| commit | cf6a9610f2e86f6de12281cc47b2d5a5acba63e4 (patch) | |
| tree | df31c803d116cb97af877e41a505376c8f7ea0e8 | |
| parent | 3b14abc8475fe0083c6becea85e3538cc391361c (diff) | |
| download | gcc-cf6a9610f2e86f6de12281cc47b2d5a5acba63e4.zip gcc-cf6a9610f2e86f6de12281cc47b2d5a5acba63e4.tar.gz gcc-cf6a9610f2e86f6de12281cc47b2d5a5acba63e4.tar.bz2 | |
decl.c (grokvardecl): Complete check added for c++/67065.
/cp
2015-08-21 Paolo Carlini <paolo.carlini@oracle.com>
* decl.c (grokvardecl): Complete check added for c++/67065.
/testsuite
2015-08-21 Paolo Carlini <paolo.carlini@oracle.com>
* g++.dg/other/pr67065.C: Extend.
From-SVN: r227061
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/decl.c | 3 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/other/pr67065.C | 2 |
4 files changed, 12 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 245cf11..f8fae34 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,7 @@ +2015-08-21 Paolo Carlini <paolo.carlini@oracle.com> + + * decl.c (grokvardecl): Complete check added for c++/67065. + 2015-08-20 Jason Merrill <jason@redhat.com> * name-lookup.c (hidden_name_p): Handle OVERLOAD. diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 4f77e7c..ab55e75 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -8357,7 +8357,8 @@ grokvardecl (tree type, if (DECL_NAME (decl) && MAIN_NAME_P (DECL_NAME (decl)) - && CP_DECL_CONTEXT (decl) == global_namespace) + && CP_DECL_CONTEXT (decl) == global_namespace + && !at_function_scope_p ()) error ("cannot declare %<::main%> to be a global variable"); /* Check that the variable can be safely declared as a concept. diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 95c8257..08d7118 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2015-08-21 Paolo Carlini <paolo.carlini@oracle.com> + + * g++.dg/other/pr67065.C: Extend. + 2015-08-21 Nathan Sidwell <nathan@acm.org> * lib/target-supports.exp (check_effective_target_freestanding): nvptx diff --git a/gcc/testsuite/g++.dg/other/pr67065.C b/gcc/testsuite/g++.dg/other/pr67065.C index cbf03b2..790bde4 100644 --- a/gcc/testsuite/g++.dg/other/pr67065.C +++ b/gcc/testsuite/g++.dg/other/pr67065.C @@ -1,3 +1,5 @@ // PR c++/67065 int main; // { dg-error "cannot declare" } + +void foo() { int main; } |