diff options
| author | Nathan Sidwell <nathan@codesourcery.com> | 2004-12-03 10:51:13 +0000 |
|---|---|---|
| committer | Nathan Sidwell <nathan@gcc.gnu.org> | 2004-12-03 10:51:13 +0000 |
| commit | f4ed7d2144f6a1754e88e03a6529aa79b4da40e4 (patch) | |
| tree | 8393d870c2f014b0d593734c85999400125c58b4 | |
| parent | bb59c339707b521bc956f4ccf08f65fd9fed2fd2 (diff) | |
| download | gcc-f4ed7d2144f6a1754e88e03a6529aa79b4da40e4.zip gcc-f4ed7d2144f6a1754e88e03a6529aa79b4da40e4.tar.gz gcc-f4ed7d2144f6a1754e88e03a6529aa79b4da40e4.tar.bz2 | |
re PR c++/18782 (ICE on invalid pointer-to-member declaration)
cp:
PR c++/18782
* decl.c (grokdeclarator): Make sure class in pointer to member is
not a namespace.
testsuite:
PR c++/18782
* g++.dg/parse/ptrmem2.C: New.
From-SVN: r91681
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/decl.c | 15 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/parse/ptrmem2.C | 11 |
4 files changed, 33 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 5ac6cd7..7ce41e4 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2004-12-03 Nathan Sidwell <nathan@codesourcery.com> + + PR c++/18782 + * decl.c (grokdeclarator): Make sure class in pointer to member is + not a namespace. + 2004-12-02 Nathan Sidwell <nathan@codesourcery.com> PR c++/18318 diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 92f294f..bf7b80f 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -7430,8 +7430,19 @@ grokdeclarator (const cp_declarator *declarator, else if (TREE_CODE (type) == METHOD_TYPE) type = build_ptrmemfunc_type (build_pointer_type (type)); else if (declarator->kind == cdk_ptrmem) - type = build_ptrmem_type (declarator->u.pointer.class_type, - type); + { + /* We might have parsed a namespace as the class type. */ + if (TREE_CODE (declarator->u.pointer.class_type) + == NAMESPACE_DECL) + { + error ("%qD is a namespace", + declarator->u.pointer.class_type); + type = build_pointer_type (type); + } + else + type = build_ptrmem_type (declarator->u.pointer.class_type, + type); + } else type = build_pointer_type (type); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index a24a39e..7f6dc12 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,8 @@ 2004-12-03 Nathan Sidwell <nathan@codesourcery.com> + PR c++/18782 + * g++.dg/parse/ptrmem2.C: New. + PR c++/18318 * g++.dg/template/new1.C: New. diff --git a/gcc/testsuite/g++.dg/parse/ptrmem2.C b/gcc/testsuite/g++.dg/parse/ptrmem2.C new file mode 100644 index 0000000..bbc116e --- /dev/null +++ b/gcc/testsuite/g++.dg/parse/ptrmem2.C @@ -0,0 +1,11 @@ +// { dg-do compile } + +// Copyright (C) 2004 Free Software Foundation, Inc. +// Contributed by Nathan Sidwell 2 Dec 2004 <nathan@codesourcery.com> + +// PR 18782: ICE with ptr-to-member +// Origin: Volker Reichelt <reichelt@gcc.gnu.org> + +namespace A {} + +int A::* p; // { dg-error "is a namespace" "" } |