From f4ed7d2144f6a1754e88e03a6529aa79b4da40e4 Mon Sep 17 00:00:00 2001 From: Nathan Sidwell Date: Fri, 3 Dec 2004 10:51:13 +0000 Subject: [PATCH] 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 --- gcc/cp/ChangeLog | 6 ++++++ gcc/cp/decl.c | 15 +++++++++++++-- gcc/testsuite/ChangeLog | 3 +++ gcc/testsuite/g++.dg/parse/ptrmem2.C | 11 +++++++++++ 4 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/g++.dg/parse/ptrmem2.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 5ac6cd74b07..7ce41e4c9d5 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2004-12-03 Nathan Sidwell + + PR c++/18782 + * decl.c (grokdeclarator): Make sure class in pointer to member is + not a namespace. + 2004-12-02 Nathan Sidwell PR c++/18318 diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 92f294f0884..bf7b80fbd84 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 a24a39e359a..7f6dc120bd0 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,8 @@ 2004-12-03 Nathan Sidwell + 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 00000000000..bbc116e9960 --- /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 + +// PR 18782: ICE with ptr-to-member +// Origin: Volker Reichelt + +namespace A {} + +int A::* p; // { dg-error "is a namespace" "" } -- 2.30.2