aboutsummaryrefslogtreecommitdiff
path: root/gcc/cp
diff options
context:
space:
mode:
authorPaolo Carlini <paolo.carlini@oracle.com>2018-12-04 23:48:45 +0000
committerPaolo Carlini <paolo@gcc.gnu.org>2018-12-04 23:48:45 +0000
commit586add7f93c60fe76dd2cede61801f83aadae7cd (patch)
treef907c5f6c811555ecc63753fc5305e8d869dea26 /gcc/cp
parent6c620b0744af235ceb1c07c214772895e0f73c15 (diff)
downloadgcc-586add7f93c60fe76dd2cede61801f83aadae7cd.zip
gcc-586add7f93c60fe76dd2cede61801f83aadae7cd.tar.gz
gcc-586add7f93c60fe76dd2cede61801f83aadae7cd.tar.bz2
re PR c++/84636 (internal compiler error: Segmentation fault (identifier_p()/grokdeclarator()))
/cp 2018-12-04 Paolo Carlini <paolo.carlini@oracle.com> PR c++/84636 * decl.c (grokdeclarator): Avoid crashing on an anonymous bit-field with function type. /testsuite 2018-12-04 Paolo Carlini <paolo.carlini@oracle.com> PR c++/84636 * g++.dg/parse/bitfield6.C: New. From-SVN: r266807
Diffstat (limited to 'gcc/cp')
-rw-r--r--gcc/cp/ChangeLog6
-rw-r--r--gcc/cp/decl.c6
2 files changed, 9 insertions, 3 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index d43d613..253af3b 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2018-12-04 Paolo Carlini <paolo.carlini@oracle.com>
+
+ PR c++/84636
+ * decl.c (grokdeclarator): Avoid crashing on an anonymous bit-field
+ with function type.
+
2018-12-04 Marek Polacek <polacek@redhat.com>
PR c++/88184 - ICE when treating name as template-name.
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 7d2c599..e662f63 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -12187,7 +12187,8 @@ grokdeclarator (const cp_declarator *declarator,
}
if (ctype && TREE_CODE (type) == FUNCTION_TYPE && staticp < 2
- && !(identifier_p (unqualified_id)
+ && !(unqualified_id
+ && identifier_p (unqualified_id)
&& IDENTIFIER_NEWDEL_OP_P (unqualified_id)))
{
cp_cv_quals real_quals = memfn_quals;
@@ -12267,8 +12268,7 @@ grokdeclarator (const cp_declarator *declarator,
error ("invalid use of %<::%>");
return error_mark_node;
}
- else if (TREE_CODE (type) == FUNCTION_TYPE
- || TREE_CODE (type) == METHOD_TYPE)
+ else if (FUNC_OR_METHOD_TYPE_P (type) && unqualified_id)
{
int publicp = 0;
tree function_context;