From: Mark Mitchell <mark@codesourcery.com>
Date: Fri, 16 Sep 2005 18:33:22 +0000 (+0000)
Subject: re PR c++/23914 (further 'non-constant' template argument case exposed by Boost)
X-Git-Tag: misc/cutover-cvs2svn~590
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=49f210a23aa8c3633fc0151792742f9049b5d9c2;p=thirdparty%2Fgcc.git

re PR c++/23914 (further 'non-constant' template argument case exposed by Boost)

	PR c++/23914
	* parser.c (cp_parser_enclosed_template_argument_list): Make sure
	skip_evaluation is false when processing template arguments.

	PR c++/23914
	* g++.dg/template/static18.C: New test.

From-SVN: r104350
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 91dc40597f2b..0680431367d0 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,9 @@
 2005-09-16  Mark Mitchell  <mark@codesourcery.com>
 
+	PR c++/23914
+	* parser.c (cp_parser_enclosed_template_argument_list): Make sure
+	skip_evaluation is false when processing template arguments.
+
 	PR c++/21514
 	* pt.c (check_instantiated_args): Treat uses of anonymous types as
 	causing type-deduction failure.
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index 0f8d17cd5040..7284d4b84b86 100644
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -15411,6 +15411,7 @@ cp_parser_enclosed_template_argument_list (cp_parser* parser)
   tree saved_qualifying_scope;
   tree saved_object_scope;
   bool saved_greater_than_is_operator_p;
+  bool saved_skip_evaluation;
 
   /* [temp.names]
 
@@ -15425,6 +15426,10 @@ cp_parser_enclosed_template_argument_list (cp_parser* parser)
   saved_scope = parser->scope;
   saved_qualifying_scope = parser->qualifying_scope;
   saved_object_scope = parser->object_scope;
+  /* We need to evaluate the template arguments, even though this
+     template-id may be nested within a "sizeof".  */
+  saved_skip_evaluation = skip_evaluation;
+  skip_evaluation = false;
   /* Parse the template-argument-list itself.  */
   if (cp_lexer_next_token_is (parser->lexer, CPP_GREATER))
     arguments = NULL_TREE;
@@ -15474,6 +15479,7 @@ cp_parser_enclosed_template_argument_list (cp_parser* parser)
   parser->scope = saved_scope;
   parser->qualifying_scope = saved_qualifying_scope;
   parser->object_scope = saved_object_scope;
+  skip_evaluation = saved_skip_evaluation;
 
   return arguments;
 }
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 6103389ca2be..7bb4fb1a793f 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,8 @@
 2005-09-16  Mark Mitchell  <mark@codesourcery.com>
 
+	PR c++/23914
+	* g++.dg/template/static18.C: New test.
+
 	PR c++/21514
 	* g++.dg/template/crash19.C: Remove dg-error marker.
 	* g++.dg/template/local4.C: New test.
diff --git a/gcc/testsuite/g++.dg/template/static18.C b/gcc/testsuite/g++.dg/template/static18.C
new file mode 100644
index 000000000000..2a2ace939149
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/static18.C
@@ -0,0 +1,13 @@
+// PR c++/23914
+
+template <class T> 
+struct foo_template { 
+  static const unsigned complexity = 0; 
+}; 
+ 
+template <int x> struct STATIC_ASSERTION {}; 
+ 
+void gcc_402_problem_minimal() 
+{ 
+  sizeof(STATIC_ASSERTION< foo_template<int>::complexity >); 
+}