From: Paolo Carlini <paolo.carlini@oracle.com>
Date: Fri, 13 Feb 2015 17:57:13 +0000 (+0000)
Subject: re PR c++/60211 (ICE with #pragma GCC ivdep and for-loop on global scope)
X-Git-Tag: releases/gcc-5.1.0~964
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e84abfa41b16b41b40dd39837caca0a7af9abee4;p=thirdparty%2Fgcc.git

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 846877159213..e6d306e6f768 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 e81e9d34767d..e0b455c88c51 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 b650ac7de539..b2d1c11f5863 100644
--- 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
index 000000000000..2b90109a81a2
--- /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 000000000000..6d8541e36f0d
--- /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" }