From: Jason Merrill <jason@redhat.com>
Date: Fri, 4 Dec 2009 22:51:12 +0000 (-0500)
Subject: re PR c++/42277 (decltype error in template)
X-Git-Tag: releases/gcc-4.5.0~1784
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=21920fd14c2f98c8ecd0ce70eaa369793276c555;p=thirdparty%2Fgcc.git

re PR c++/42277 (decltype error in template)

	PR c++/42277
	* semantics.c (finish_decltype_type): Don't assume that op1 of a
	COMPONENT_REF is always the field.
	* g++.dg/cpp0x/decltype20.C: New.

From-SVN: r155002
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 0c96a780b782..7ec27d402a10 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2009-12-04  Jason Merrill  <jason@redhat.com>
+
+	PR c++/42277
+	* semantics.c (finish_decltype_type): Defer handling of decltype
+	of a non-dependent COMPONENT_REF in a template.
+
 2009-12-04  Dodji Seketeli  <dodji@redhat.com>
 
 	PR c++/42218
diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c
index 4c3628034b3e..841efc8fafc6 100644
--- a/gcc/cp/semantics.c
+++ b/gcc/cp/semantics.c
@@ -4777,7 +4777,13 @@ finish_decltype_type (tree expr, bool id_expression_or_member_access_p)
       return error_mark_node;
     }
 
-  if (type_dependent_expression_p (expr))
+  if (type_dependent_expression_p (expr)
+      /* In a template, a COMPONENT_REF has an IDENTIFIER_NODE for op1 even
+	 if it isn't dependent, so that we can check access control at
+	 instantiation time, so defer the decltype as well (PR 42277).  */
+      || (id_expression_or_member_access_p
+	  && processing_template_decl
+	  && TREE_CODE (expr) == COMPONENT_REF))
     {
       if (id_expression_or_member_access_p)
 	{
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index b20ddd2fdcf5..ed866cf01999 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2009-12-04  Jason Merrill  <jason@redhat.com>
+
+	PR c++/42277
+	* g++.dg/cpp0x/decltype20.C: New.
+
 2009-12-04  David Daney  <ddaney@caviumnetworks.com>
 
 	PR rtl-optimization/42164
diff --git a/gcc/testsuite/g++.dg/cpp0x/decltype20.C b/gcc/testsuite/g++.dg/cpp0x/decltype20.C
new file mode 100644
index 000000000000..3155cdcf86a4
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/decltype20.C
@@ -0,0 +1,10 @@
+// PR c++/42277
+// { dg-options -std=c++0x }
+
+struct S { int s; };
+template <int N>
+void foo ()
+{
+  S s;
+  decltype (s.s) i;
+}