re PR c++/50864 (ICE with decltype and "declval" from another namespace)

/cp
2011-11-08  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/50864
	* parser.c (cp_parser_postfix_dot_deref_expression): Reject invalid
	uses of '->' and '.' as postfix-expression in namespace scope.

/testsuite
2011-11-08  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/50864
	* g++.dg/parse/template26.C: New.
	* g++.dg/template/crash45.C: Adjust dg-error string.

From-SVN: r181151

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 98e0fe36fc01029e7aa5ef31a4b7cf58c6690296..5a492e9ca2023d755c2635778fb461dd6cc0fd52 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2011-11-08  Paolo Carlini  <paolo.carlini@oracle.com>
+
+       PR c++/50864
+       * parser.c (cp_parser_postfix_dot_deref_expression): Reject invalid
+       uses of '->' and '.' as postfix-expression in namespace scope.
+
 2011-11-07  Jason Merrill  <jason@redhat.com>
 
        PR c++/50848

diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index 697be809adb036a627161f3c7f00cdf313840eef..7d04971eea5ded73edd2b35fc44c04f42ee47e71 100644 (file)
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -5969,10 +5969,17 @@ cp_parser_postfix_dot_deref_expression (cp_parser *parser,
        {
          if (name != error_mark_node && !BASELINK_P (name) && parser->scope)
            {
-             name = build_qualified_name (/*type=*/NULL_TREE,
-                                          parser->scope,
-                                          name,
-                                          template_p);
+             if (TREE_CODE (parser->scope) == NAMESPACE_DECL)
+               {
+                 error_at (token->location, "%<%D::%D%> is not a class member",
+                           parser->scope, name);
+                 postfix_expression = error_mark_node;
+               }
+             else
+               name = build_qualified_name (/*type=*/NULL_TREE,
+                                            parser->scope,
+                                            name,
+                                            template_p);
              parser->scope = NULL_TREE;
              parser->qualifying_scope = NULL_TREE;
              parser->object_scope = NULL_TREE;

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 875e0997d21196f5b7c2e1c7adadb9c64bb486d8..12ad3d45dc7bc2ca8f01af1f66945ec53c18d36b 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2011-11-08  Paolo Carlini  <paolo.carlini@oracle.com>
+
+       PR c++/50864
+       * g++.dg/parse/template26.C: New.
+       * g++.dg/template/crash45.C: Adjust dg-error string.
+
 2011-11-07  Jason Merrill  <jason@redhat.com>
 
        PR c++/50848

diff --git a/gcc/testsuite/g++.dg/parse/template26.C b/gcc/testsuite/g++.dg/parse/template26.C
new file mode 100644 (file)
index 0000000..aab9763
--- /dev/null
+++ b/gcc/testsuite/g++.dg/parse/template26.C
@@ -0,0 +1,18 @@
+// PR c++/50864
+
+namespace impl
+{
+  template <class T> T create();
+}
+
+template <class T, class U, __SIZE_TYPE__
+         = sizeof(impl::create<T>()->*impl::create<U>())>
+struct foo1;
+
+template <class T, class U, __SIZE_TYPE__
+         = sizeof(impl::create<T>()->impl::create<U>())> // { dg-error "not a class member" }
+struct foo2;
+
+template <class T, class U, __SIZE_TYPE__
+         = sizeof(impl::create<T>().impl::create<U>())> // { dg-error "not a class member" }
+struct foo3;

diff --git a/gcc/testsuite/g++.dg/template/crash45.C b/gcc/testsuite/g++.dg/template/crash45.C
index f138e3d6169fcb9380f6b98576dcbdee7a55171c..f67fd022f63061157779424b60e9e5ae68120061 100644 (file)
--- a/gcc/testsuite/g++.dg/template/crash45.C
+++ b/gcc/testsuite/g++.dg/template/crash45.C
@@ -9,5 +9,5 @@ namespace N
 
 void bar(A *p)
 {
-  p->N::foo<0>; // { dg-error "not a member" } 
+  p->N::foo<0>; // { dg-error "not a class member" }
 }