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

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 84687715921382ae273c9519b6ca22f6ea95a59c..e6d306e6f768950c025fa0f3aa7b2ead8502a233 100644 (file)
--- 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 e81e9d34767d57340f689eec5f43ef524600e389..e0b455c88c519f4c0f0224e50ff627ba9c782b2e 100644 (file)
--- 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 b650ac7de5397b4a10ba2a643f1be33da560d3df..b2d1c11f5863c13cb051f4e3de7e171bea8a5091 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+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.
+
 2015-02-13  Jerry DeLisle  <jvdelisle@gcc.gnu.org>
 
        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 (file)
index 0000000..2b90109
--- /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 (file)
index 0000000..6d8541e
--- /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" }