mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-04-03 23:31:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

decl2.c (grokbitfield): Use DECL_SOURCE_LOCATION in error message...

Browse Source 
/cp
2018-12-06  Paolo Carlini  <paolo.carlini@oracle.com>

	* decl2.c (grokbitfield): Use DECL_SOURCE_LOCATION in error message;
	print the type too; fix thinko in INDIRECT_TYPE_P use.

/testsuite
2018-12-06  Paolo Carlini  <paolo.carlini@oracle.com>

	* g++.dg/parse/bitfield6b.C: New.
	* g++.dg/parse/bitfield3.C: Test location and type.

From-SVN: r266841
This commit is contained in:
Paolo Carlini 2018-12-06 08:23:04 +00:00 committed by Paolo Carlini
parent bd38d0da47
commit 34b1a7d63d
5 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/cp/ChangeLog
View File

@ -1,3 +1,8 @@
2018-12-06 Paolo Carlini <paolo.carlini@oracle.com>
* decl2.c (grokbitfield): Use DECL_SOURCE_LOCATION in error message;
print the type too; fix thinko in INDIRECT_TYPE_P use.
2018-12-05 Alexandre Oliva <aoliva@redhat.com>
PR c++/85569

15
gcc/cp/decl2.c
View File

@ -1016,18 +1016,21 @@ grokbitfield (const cp_declarator *declarator,
if (value == error_mark_node)
return NULL_TREE; /* friends went bad. */
if (TREE_TYPE (value) == error_mark_node)
tree type = TREE_TYPE (value);
if (type == error_mark_node)
return value;
/* Pass friendly classes back. */
if (VOID_TYPE_P (value))
return void_type_node;
if (!INTEGRAL_OR_ENUMERATION_TYPE_P (TREE_TYPE (value))
&& (INDIRECT_TYPE_P (value)
|| !dependent_type_p (TREE_TYPE (value))))
if (!INTEGRAL_OR_ENUMERATION_TYPE_P (type)
&& (INDIRECT_TYPE_P (type) || !dependent_type_p (type)))
{
error ("bit-field %qD with non-integral type", value);
error_at (DECL_SOURCE_LOCATION (value),
"bit-field %qD with non-integral type %qT",
value, type);
return error_mark_node;
}
@ -1048,7 +1051,7 @@ grokbitfield (const cp_declarator *declarator,
return NULL_TREE;
}
if (width && TYPE_WARN_IF_NOT_ALIGN (TREE_TYPE (value)))
if (width && TYPE_WARN_IF_NOT_ALIGN (type))
{
error ("cannot declare bit-field %qD with %<warn_if_not_aligned%> type",
DECL_NAME (value));

5
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2018-12-06 Paolo Carlini <paolo.carlini@oracle.com>
* g++.dg/parse/bitfield6b.C: New.
* g++.dg/parse/bitfield3.C: Test location and type.
2018-12-06 Iain Sandoe <iain@sandoe.co.uk>
* lib/c-compat.exp (compat-use-alt-compiler):

2
gcc/testsuite/g++.dg/parse/bitfield3.C
View File

@ -5,5 +5,5 @@ typedef void (func_type)();
struct A
{
friend func_type f : 2; /* { dg-error "with non-integral type" } */
friend func_type f : 2; /* { dg-error "20:bit-field .void f\\(\\). with non-integral type .func_type." } */
};

4
gcc/testsuite/g++.dg/parse/bitfield6b.C Normal file
View File

@ -0,0 +1,4 @@
typedef void a();
struct A {
a a1: 1; // { dg-error "3:bit-field .void A::a1\\(\\). with non-integral type .void \\(A::\\)\\(\\)." }
};