diff options
| author | Tom Tromey <tom@tromey.com> | 2019-07-06 15:52:13 -0600 |
|---|---|---|
| committer | Tom Tromey <tom@tromey.com> | 2019-08-15 12:29:28 -0600 |
| commit | 002f15c27779e154856fdf281360385f4d3be671 (patch) | |
| tree | f0db85371f7c826f4c2ab54b0d19da9358379f9a /gdb/tui/tui-winsource.h | |
| parent | c9033fe839e37a378ff86e614a7d6e939b94f6c9 (diff) | |
| download | binutils-002f15c27779e154856fdf281360385f4d3be671.zip binutils-002f15c27779e154856fdf281360385f4d3be671.tar.gz binutils-002f15c27779e154856fdf281360385f4d3be671.tar.bz2 | |
Remove tui_alloc_source_buffer
There is no longer any need for tui_alloc_source_buffer. The two
callers of this function immediately change the contents of the
window, undoing the work done by this function.
This required adding a move constructor to tui_source_element -- a
mildly surprising find, but without this, resizing the vector will
cause crashes. This issue was masked earlier because
tui_alloc_source_buffer handled this.
Note that a patch for this bug was submitted here:
https://sourceware.org/ml/gdb-patches/2019-08/msg00094.html
That patch is better, IMO, but the author as yet hasn't responded to a
request for a ChangeLog entry.
gdb/ChangeLog
2019-08-15 Tom Tromey <tom@tromey.com>
* tui/tui-winsource.h (tui_alloc_source_buffer): Don't declare.
(struct tui_source_element): Add DISABLE_COPY_AND_ASSIGN, and move
constructor.
* tui/tui-winsource.c (tui_alloc_source_buffer): Remove.
* tui/tui-source.c (tui_set_source_content): Update.
* tui/tui-disasm.c (tui_set_disassem_content): Update.
Diffstat (limited to 'gdb/tui/tui-winsource.h')
| -rw-r--r-- | gdb/tui/tui-winsource.h | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/gdb/tui/tui-winsource.h b/gdb/tui/tui-winsource.h index 237c4da..bff2560 100644 --- a/gdb/tui/tui-winsource.h +++ b/gdb/tui/tui-winsource.h @@ -69,6 +69,17 @@ struct tui_source_element xfree (line); } + DISABLE_COPY_AND_ASSIGN (tui_source_element); + + tui_source_element (tui_source_element &&other) + : line (other.line), + line_or_addr (other.line_or_addr), + is_exec_point (other.is_exec_point), + break_mode (other.break_mode) + { + other.line = nullptr; + } + char *line = nullptr; struct tui_line_or_address line_or_addr; bool is_exec_point = false; @@ -173,9 +184,6 @@ extern void tui_update_source_windows_with_line (struct symtab *, extern void tui_clear_source_content (struct tui_source_window_base *); extern void tui_erase_source_content (struct tui_source_window_base *); -extern void tui_alloc_source_buffer (struct tui_source_window_base *); - - /* Constant definitions. */ #define SCROLL_THRESHOLD 2 /* Threshold for lazy scroll. */ |