aboutsummaryrefslogtreecommitdiff
path: root/gcc/cp
diff options
context:
space:
mode:
authorPaolo Carlini <paolo.carlini@oracle.com>2015-02-13 17:57:13 +0000
committerPaolo Carlini <paolo@gcc.gnu.org>2015-02-13 17:57:13 +0000
commite84abfa41b16b41b40dd39837caca0a7af9abee4 (patch)
tree666d96987ffd1302dec8b55d00b3ee78027c7daf /gcc/cp
parentd1ae5966d746eeea7c0f2d4e77c7cf93bb507512 (diff)
downloadgcc-e84abfa41b16b41b40dd39837caca0a7af9abee4.zip
gcc-e84abfa41b16b41b40dd39837caca0a7af9abee4.tar.gz
gcc-e84abfa41b16b41b40dd39837caca0a7af9abee4.tar.bz2
re PR c++/60211 (ICE with #pragma GCC ivdep and for-loop on global scope)
/cp 2015-02-13 Paolo Carlini <paolo.carlini@oracle.com> PR c++/60211 * parser.c (cp_parser_pragma): Diagnose PRAGMA_IVDEP at pragma_external context. /testsuite 2015-02-13 Paolo Carlini <paolo.carlini@oracle.com> PR c++/60211 * g++.dg/parse/ivdep-2.C: New. * g++.dg/parse/ivdep-3.C: Likewise. From-SVN: r220689
Diffstat (limited to 'gcc/cp')
-rw-r--r--gcc/cp/ChangeLog6
-rw-r--r--gcc/cp/parser.c6
2 files changed, 12 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 8468771..e6d306e 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2015-02-13 Paolo Carlini <paolo.carlini@oracle.com>
+
+ PR c++/60211
+ * parser.c (cp_parser_pragma): Diagnose PRAGMA_IVDEP at
+ pragma_external context.
+
2015-02-13 Jason Merrill <jason@redhat.com>
PR c++/65051
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index e81e9d3..e0b455c 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);