re PR c++/60267 (ICE in c_pp_lookup_pragma, at c-family/c-pragma.c:1232; ICE in…

re PR c++/60267 (ICE in c_pp_lookup_pragma, at c-family/c-pragma.c:1232; ICE in tsubst_copy, at cp/pt.c:12887)

	PR c++/60267
	* pt.c (tsubst_expr): Handle ANNOTATE_EXPR.

	* g++.dg/ext/ivdep-1.C: New test.

From-SVN: r207914

gcc/cp/ChangeLog

+2014-02-19  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c++/60267
+	* pt.c (tsubst_expr): Handle ANNOTATE_EXPR.
+
 2014-02-18  Paolo Carlini  <paolo.carlini@oracle.com>
 
 	PR c++/60225

gcc/cp/pt.c

@@ -13806,6 +13806,11 @@ tsubst_expr (tree t, tree args, tsubst_flags_t complain, tree in_decl,
 				    RECUR (TREE_OPERAND (t, 1)),
 				    complain));
 
+    case ANNOTATE_EXPR:
+      tmp = RECUR (TREE_OPERAND (t, 0));
+      RETURN (build2_loc (EXPR_LOCATION (t), ANNOTATE_EXPR,
+			  TREE_TYPE (tmp), tmp, RECUR (TREE_OPERAND (t, 1))));
+
     default:
       gcc_assert (!STATEMENT_CODE_P (TREE_CODE (t)));
 

gcc/testsuite/ChangeLog

 2014-02-19  Jakub Jelinek  <jakub@redhat.com>
 
 	PR c++/60267
+	* g++.dg/ext/ivdep-1.C: New test.
+
+	PR c++/60267
 	* gcc.dg/pr60267.c: New test.
 
 2014-02-19  Uros Bizjak  <ubizjak@gmail.com>

gcc/testsuite/g++.dg/ext/ivdep-1.C

+// PR c++/60267
+// { dg-do compile }
+// { dg-options "-O3" }
+
+template <int N>
+void
+foo (int *a, int *b, int *c)
+{
+#pragma GCC ivdep
+  for (int i = 0; i < N; i++)
+    a[i] = b[i] * c[i];
+}
+
+void
+bar (int *a, int *b, int *c)
+{
+  foo <64> (a, b, c);
+}