mirrors/gcc
1
0
Fork 0
mirror of https://gcc.gnu.org/git/gcc.git synced 2024-11-26 21:33:59 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix PR libcc1/113977

Browse Source 
PR libcc1/113977 points out a case where a simple expression is
rejected with a compiler error message.  The bug here is that gdb does
not inform the plugin of the correct alignment -- in fact, there is no
way to do that.

This patch adds a new method to allow the alignment to be set, and
bumps the C front end protocol version.

It also includes some updates to various comments in 'include', done
here to simplify the merge to binutils-gdb.

include

	* gcc-cp-interface.h (gcc_cp_fe_context_function): Update
	comment.
	* gcc-c-interface.h (enum gcc_c_api_version) <GCC_C_FE_VERSION_2>:
	New constant.
	(gcc_c_fe_context_function): Update comment.
	* gcc-c-fe.def (finish_record_with_alignment): New method.
	Update documentation.

libcc1

	PR libcc1/113977
	* libcc1plugin.cc (plugin_finish_record_or_union): New function.
	(plugin_finish_record_or_union): Rewrite.
	(plugin_init): Use GCC_C_FE_VERSION_2.
	* libcc1.cc (c_vtable): Use GCC_C_FE_VERSION_2.
	(gcc_c_fe_context): Check for GCC_C_FE_VERSION_2.
This commit is contained in:
Tom Tromey 2024-02-26 18:21:03 -07:00
parent 54137725cf
commit bc0e18a960
5 changed files with 47 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
include/gcc-c-fe.def
View File

@ -89,7 +89,10 @@ GCC_METHOD5 (int /* bool */, build_add_field,
/* After all the fields have been added to a struct or union, the
struct or union type must be "finished". This does some final
cleanups in GCC. */
cleanups in GCC.
Note that when using GCC_C_FE_VERSION_2, it is preferable to call
finish_record_with_alignment instead. */
GCC_METHOD2 (int /* bool */, finish_record_or_union,
gcc_type, /* Argument RECORD_OR_UNION_TYPE. */
@ -220,3 +223,11 @@ GCC_METHOD2 (gcc_type, float_type,
unsigned long, /* Argument SIZE_IN_BYTES. */
const char *) /* Argument BUILTIN_NAME. */
/* New in GCC_FE_VERSION_2. Like finish_record_or_union but the caller also
supplies the alignment. If the alignment is 0, this acts identically to
finish_record_or_union. */
GCC_METHOD3 (int /* bool */, finish_record_with_alignment,
gcc_type, /* Argument RECORD_OR_UNION_TYPE. */
unsigned long, /* Argument SIZE_IN_BYTES. */
unsigned long) /* Argument ALIGNMENT. */

11
include/gcc-c-interface.h
View File

@ -45,7 +45,10 @@ enum gcc_c_api_version
/* Added char_type. Added new version of int_type and float_type,
deprecated int_type_v0 and float_type_v0. */
GCC_C_FE_VERSION_1 = 1
GCC_C_FE_VERSION_1 = 1,
/* Added finish_record_with_alignment method. */
GCC_C_FE_VERSION_2 = 2,
};
/* Qualifiers. */
@ -198,7 +201,11 @@ struct gcc_c_context
/* The type of the initialization function. The caller passes in the
desired base version and desired C-specific version. If the
request can be satisfied, a compatible gcc_context object will be
returned. Otherwise, the function returns NULL. */
returned. In particular, this may return a context object with a higher
actual version number than was requested, provided the higher version is
fully compatible. (As of GCC_C_FE_VERSION_2, this is always true.)
Otherwise, the function returns NULL. */
typedef struct gcc_c_context *gcc_c_fe_context_function
(enum gcc_base_api_version,

6
include/gcc-cp-interface.h
View File

@ -483,7 +483,11 @@ struct gcc_cp_context
/* The type of the initialization function. The caller passes in the
desired base version and desired C-specific version. If the
request can be satisfied, a compatible gcc_context object will be
returned. Otherwise, the function returns NULL. */
returned. In particular, this may return a context object with a higher
actual version number than was requested, provided the higher version is
fully compatible.
Otherwise, the function returns NULL. */
typedef struct gcc_cp_context *gcc_cp_fe_context_function
(enum gcc_base_api_version,

5
libcc1/libcc1.cc
View File

@ -108,7 +108,7 @@ set_callbacks (struct gcc_c_context *s,
static const struct gcc_c_fe_vtable c_vtable =
{
GCC_C_FE_VERSION_1,
GCC_C_FE_VERSION_2,
set_callbacks,
#define GCC_METHOD0(R, N) \
@ -165,7 +165,8 @@ gcc_c_fe_context (enum gcc_base_api_version base_version,
enum gcc_c_api_version c_version)
{
if ((base_version != GCC_FE_VERSION_0 && base_version != GCC_FE_VERSION_1)
|| (c_version != GCC_C_FE_VERSION_0 && c_version != GCC_C_FE_VERSION_1))
|| (c_version != GCC_C_FE_VERSION_0 && c_version != GCC_C_FE_VERSION_1
&& c_version != GCC_C_FE_VERSION_2))
return NULL;
return new libcc1 (&c_vtable);

26
libcc1/libcc1plugin.cc
View File

@ -387,9 +387,10 @@ plugin_build_add_field (cc1_plugin::connection *,
}
int
plugin_finish_record_or_union (cc1_plugin::connection *,
gcc_type record_or_union_type_in,
unsigned long size_in_bytes)
plugin_finish_record_with_alignment (cc1_plugin::connection *,
gcc_type record_or_union_type_in,
unsigned long size_in_bytes,
unsigned long align)
{
tree record_or_union_type = convert_in (record_or_union_type_in);
@ -407,10 +408,10 @@ plugin_finish_record_or_union (cc1_plugin::connection *,
}
else
{
// FIXME there's no way to get this from DWARF,
// or even, it seems, a particularly good way to deduce it.
SET_TYPE_ALIGN (record_or_union_type,
TYPE_PRECISION (pointer_sized_int_node));
if (align == 0)
align = TYPE_PRECISION (pointer_sized_int_node);
SET_TYPE_ALIGN (record_or_union_type, align);
TYPE_SIZE (record_or_union_type) = bitsize_int (size_in_bytes
* BITS_PER_UNIT);
@ -441,6 +442,15 @@ plugin_finish_record_or_union (cc1_plugin::connection *,
return 1;
}
int
plugin_finish_record_or_union (cc1_plugin::connection *conn,
gcc_type record_or_union_type_in,
unsigned long size_in_bytes)
{
return plugin_finish_record_with_alignment (conn, record_or_union_type_in,
size_in_bytes, 0);
}
gcc_type
plugin_build_enum_type (cc1_plugin::connection *self,
gcc_type underlying_int_type_in)
@ -755,7 +765,7 @@ int
plugin_init (struct plugin_name_args *plugin_info,
struct plugin_gcc_version *)
{
generic_plugin_init (plugin_info, GCC_C_FE_VERSION_1);
generic_plugin_init (plugin_info, GCC_C_FE_VERSION_2);
register_callback (plugin_info->base_name, PLUGIN_PRAGMAS,
plugin_init_extra_pragmas, NULL);