From 6a3e66dcc0730393d57d4ba8bed927c4b1f24b75 Mon Sep 17 00:00:00 2001 From: paolo Date: Fri, 13 Feb 2015 17:57:13 +0000 Subject: [PATCH] /cp 2015-02-13 Paolo Carlini PR c++/60211 * parser.c (cp_parser_pragma): Diagnose PRAGMA_IVDEP at pragma_external context. /testsuite 2015-02-13 Paolo Carlini PR c++/60211 * g++.dg/parse/ivdep-2.C: New. * g++.dg/parse/ivdep-3.C: Likewise. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@220689 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/cp/ChangeLog | 6 ++++++ gcc/cp/parser.c | 6 ++++++ gcc/testsuite/ChangeLog | 6 ++++++ gcc/testsuite/g++.dg/parse/ivdep-2.C | 9 +++++++++ gcc/testsuite/g++.dg/parse/ivdep-3.C | 8 ++++++++ 5 files changed, 35 insertions(+) create mode 100644 gcc/testsuite/g++.dg/parse/ivdep-2.C create mode 100644 gcc/testsuite/g++.dg/parse/ivdep-3.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 84687715921..e6d306e6f76 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2015-02-13 Paolo Carlini + + PR c++/60211 + * parser.c (cp_parser_pragma): Diagnose PRAGMA_IVDEP at + pragma_external context. + 2015-02-13 Jason Merrill PR c++/65051 diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index e81e9d34767..e0b455c88c5 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -33060,6 +33060,12 @@ cp_parser_pragma (cp_parser *parser, enum pragma_context context) case PRAGMA_IVDEP: { + if (context == pragma_external) + { + error_at (pragma_tok->location, + "%<#pragma GCC ivdep%> must be inside a function"); + break; + } cp_parser_skip_to_pragma_eol (parser, pragma_tok); cp_token *tok; tok = cp_lexer_peek_token (the_parser->lexer); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index b650ac7de53..b2d1c11f586 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2015-02-13 Paolo Carlini + + PR c++/60211 + * g++.dg/parse/ivdep-2.C: New. + * g++.dg/parse/ivdep-3.C: Likewise. + 2015-02-13 Jerry DeLisle PR fortran/64506 diff --git a/gcc/testsuite/g++.dg/parse/ivdep-2.C b/gcc/testsuite/g++.dg/parse/ivdep-2.C new file mode 100644 index 00000000000..2b90109a81a --- /dev/null +++ b/gcc/testsuite/g++.dg/parse/ivdep-2.C @@ -0,0 +1,9 @@ +// PR c++/60211 + +void foo() +{} + int i; +#pragma GCC ivdep // { dg-error "must be inside a function" } + for (i = 0; i < 2; ++i) // { dg-error "expected|type" } + ; +} // { dg-error "expected" } diff --git a/gcc/testsuite/g++.dg/parse/ivdep-3.C b/gcc/testsuite/g++.dg/parse/ivdep-3.C new file mode 100644 index 00000000000..6d8541e36f0 --- /dev/null +++ b/gcc/testsuite/g++.dg/parse/ivdep-3.C @@ -0,0 +1,8 @@ +// PR c++/60211 + +void foo() +{} +#pragma GCC ivdep // { dg-error "must be inside a function" } + for (int i = 0; i < 2; ++i) // { dg-error "expected|type" } + ; +} // { dg-error "expected" } -- 2.11.4.GIT