From c530603c59efb5630ce67446be64d42c0522fee2 Mon Sep 17 00:00:00 2001 From: Tom de Vries Date: Sat, 16 Jun 2018 18:39:30 +0200 Subject: [PATCH] [gdb] Fix build error in macroexp.c MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit When doing a combined build with the gcc and binutils-gdb repos, I run into this build error in gdb: ... gdb/macroexp.c: \ In function ‘void get_next_token_for_substitution(macro_buffer*, \ macro_buffer*, char**, macro_buffer*, char**, int*, bool*)’: gdb/macroexp.c:925:17: error: \ implicitly-declared ‘constexpr macro_buffer& \ macro_buffer::operator=(const macro_buffer&)’ is deprecated \ [-Werror=deprecated-copy] *token = *lookahead; ... Wdeprecated-copy is a new gcc warning added after gcc 8. This patch fixes the build error by adding an explicit copy operator to the macro_buffer class. I've added asserts to ensure that both the dest and src of the copy are shared, in other words, neither is owner of the text pointer. I've run the gdb testsuite on x86_64-linux and the asserts did not trigger. 2018-07-05 Tom de Vries * macroexp.c (macro_buffer) : New member function. --- gdb/ChangeLog | 4 ++++ gdb/macroexp.c | 10 ++++++++++ 2 files changed, 14 insertions(+) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 7bd0cc4f95e..39165f7cf4b 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,7 @@ +2018-07-05 Tom de Vries + + * macroexp.c (macro_buffer) : New member function. + 2018-07-04 Tom Tromey * darwin-nat.c (darwin_attach_pid): Use exit_inferior. diff --git a/gdb/macroexp.c b/gdb/macroexp.c index 1fa37d2875b..36d0319f310 100644 --- a/gdb/macroexp.c +++ b/gdb/macroexp.c @@ -112,6 +112,16 @@ struct macro_buffer shared = true; } + macro_buffer& operator= (const macro_buffer &src) + { + gdb_assert (src.shared); + gdb_assert (shared); + set_shared (src.text, src.len); + last_token = src.last_token; + is_identifier = src.is_identifier; + return *this; + } + ~macro_buffer () { if (! shared && size) -- 2.30.2