From ca72c6bb11fe2d73c5ec8b636b83cf4ea997ea35 Mon Sep 17 00:00:00 2001 From: paolo Date: Tue, 26 Nov 2013 11:31:46 +0000 Subject: [PATCH] /cp 2013-11-26 Paolo Carlini PR c++/58700 * decl.c (grokdeclarator): Don't try to pass declarator->id_loc to build_lang_decl_loc when declarator is null. /testsuite 2013-11-26 Paolo Carlini PR c++/58700 * g++.dg/parse/bitfield4.C: New. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@205389 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/cp/ChangeLog | 6 ++++++ gcc/cp/decl.c | 4 +++- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/g++.dg/parse/bitfield4.C | 6 ++++++ 4 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/g++.dg/parse/bitfield4.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 143885c..604f26d 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,11 @@ 2013-11-26 Paolo Carlini + PR c++/58700 + * decl.c (grokdeclarator): Don't try to pass declarator->id_loc + to build_lang_decl_loc when declarator is null. + +2013-11-26 Paolo Carlini + * cvt.c (cp_convert_and_check): Avoid calling cp_convert unnecessarily. diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index bf4d8e3..9508131 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -10637,7 +10637,9 @@ grokdeclarator (const cp_declarator *declarator, { /* C++ allows static class members. All other work for this is done by grokfield. */ - decl = build_lang_decl_loc (declarator->id_loc, + decl = build_lang_decl_loc (declarator + ? declarator->id_loc + : input_location, VAR_DECL, unqualified_id, type); set_linkage_for_static_data_member (decl); /* Even if there is an in-class initialization, DECL diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 25d8873..6639f05 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2013-11-26 Paolo Carlini + + PR c++/58700 + * g++.dg/parse/bitfield4.C: New. + 2013-11-26 Richard Biener PR tree-optimization/59287 diff --git a/gcc/testsuite/g++.dg/parse/bitfield4.C b/gcc/testsuite/g++.dg/parse/bitfield4.C new file mode 100644 index 0000000..e10fa5f --- /dev/null +++ b/gcc/testsuite/g++.dg/parse/bitfield4.C @@ -0,0 +1,6 @@ +// PR c++/58700 + +struct A +{ + static int : 4; // { dg-error "bit-field" } +}; -- 2.7.4