gcc/cp/

2010-07-05  Shujing Zhao  <pearly.zhao@oracle.com>

        PR c++/22138
        * parser.c (cp_parser_primary_expression): Error if local template is
        declared.

gcc/testsuite/
2010-07-05  Shujing Zhao  <pearly.zhao@oracle.com>

        PR c++/22138
        * g++.dg/parse/template25.C: New.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@161818 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index e7a9e85..354c767 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2010-07-05  Shujing Zhao  <pearly.zhao@oracle.com>
+
+        PR c++/22138
+        * parser.c (cp_parser_primary_expression): Error if local template is
+        declared.
+
 2010-07-02  Le-Chun Wu  <lcwu@google.com>
 
        PR/44128

diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index e8f10a4..b35d9a5 100644 (file)
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -3754,6 +3754,16 @@ cp_parser_primary_expression (cp_parser *parser,
        case RID_AT_SELECTOR:
          return cp_parser_objc_expression (parser);
 
+       case RID_TEMPLATE:
+         if (parser->in_function_body
+             && (cp_lexer_peek_nth_token (parser->lexer, 2)->type
+                 == CPP_LESS))
+           {
+             error_at (token->location,
+                       "a template declaration cannot appear at block scope");
+             cp_parser_skip_to_end_of_block_or_statement (parser);
+             return error_mark_node;
+           }
        default:
          cp_parser_error (parser, "expected primary-expression");
          return error_mark_node;

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index ca16bb6..e8b0959 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2010-07-05  Shujing Zhao  <pearly.zhao@oracle.com>
+
+       PR c++/22138
+       * g++.dg/parse/template25.C: New.
+
 2010-07-04  H.J. Lu  <hongjiu.lu@intel.com>
 
        PR rtl-optimization/44695

diff --git a/gcc/testsuite/g++.dg/parse/template25.C b/gcc/testsuite/g++.dg/parse/template25.C
new file mode 100644 (file)
index 0000000..8ffcd12
--- /dev/null
+++ b/gcc/testsuite/g++.dg/parse/template25.C
@@ -0,0 +1,14 @@
+// PR c++/22318. Improve diagnostic for local template declaration.
+// { dg-do compile }
+void f(void)
+{
+  template<typename T> class A /* { dg-error "a template declaration cannot appear at block scope" } */
+  {
+  };
+}
+
+void g(void)
+{
+  template f<int>(); /* { dg-error "expected primary-expression" } */
+  /* { dg-error "expected ';'" "" { target *-*-* } 12 } */
+}