FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

gdb/disasm.h: Mark callbacks noexcept unconditionally

Browse source 
Given that C++17 is now a requirement for GDB, update gdb/disasm.h to
define callback function types noexcept unconditionally.  The pre-C++17
configuration is not supported anymore.

Change-Id: I0a38e22b7912c70a11425363a991f0b01614343e
Approved-By: Tom Tromey <tom@tromey.com>
Approved-By: Pedro Alves <pedro@palves.net>
This commit is contained in:
Lancelot Six 2023-10-13 12:45:58 +00:00
parent 70d02be7e3
commit 072f1814d3
1 changed files with 6 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
gdb/disasm.h
View file

@ -26,12 +26,6 @@ struct gdbarch;
struct ui_out;
struct ui_file;
#if __cplusplus >= 201703L
#define LIBOPCODE_CALLBACK_NOEXCEPT noexcept
#else
#define LIBOPCODE_CALLBACK_NOEXCEPT
#endif
/* A wrapper around a disassemble_info and a gdbarch. This is the core
set of data that all disassembler sub-classes will need. This class
doesn't actually implement the disassembling process, that is something
@ -58,27 +52,18 @@ struct gdb_disassemble_info
protected:
/* Types for the function callbacks within m_di. The actual function
signatures here are taken from include/dis-asm.h. The noexcept macro
expands to 'noexcept' for C++17 and later, otherwise, it expands to
nothing. This is because including noexcept was ignored for function
types before C++17, but both GCC and Clang warn that the noexcept
will become relevant when you switch to C++17, and this warning
causes the build to fail. */
signatures here are taken from include/dis-asm.h. */
using read_memory_ftype
= int (*) (bfd_vma, bfd_byte *, unsigned int, struct disassemble_info *)
LIBOPCODE_CALLBACK_NOEXCEPT;
noexcept;
using memory_error_ftype
= void (*) (int, bfd_vma, struct disassemble_info *)
LIBOPCODE_CALLBACK_NOEXCEPT;
= void (*) (int, bfd_vma, struct disassemble_info *) noexcept;
using print_address_ftype
= void (*) (bfd_vma, struct disassemble_info *)
LIBOPCODE_CALLBACK_NOEXCEPT;
= void (*) (bfd_vma, struct disassemble_info *) noexcept;
using fprintf_ftype
= int (*) (void *, const char *, ...)
LIBOPCODE_CALLBACK_NOEXCEPT;
= int (*) (void *, const char *, ...) noexcept;
using fprintf_styled_ftype
= int (*) (void *, enum disassembler_style, const char *, ...)
LIBOPCODE_CALLBACK_NOEXCEPT;
= int (*) (void *, enum disassembler_style, const char *, ...) noexcept;
/* Constructor, many fields in m_di are initialized from GDBARCH. The
remaining arguments are function callbacks that are written into m_di.