Patchwork [11/23] tfile_target::close: trace_fd can't be -1

login
register
mail settings
Submitter Pedro Alves
Date Sept. 6, 2019, 11:27 p.m.
Message ID <20190906232807.6191-12-palves@redhat.com>
Download mbox | patch
Permalink /patch/34422/
State New
Headers show

Comments

Pedro Alves - Sept. 6, 2019, 11:27 p.m.
It's not possible to open a tfile target with an invalid trace_fd, and
it's not possible to close a closed target, so this early return is dead.

gdb/ChangeLog:
yyyy-mm-dd  Pedro Alves  <palves@redhat.com>

	* tracefile-tfile.c (tfile_target::close): Assert that trace_fd is
	not -1.
---
 gdb/tracefile-tfile.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Patch

diff --git a/gdb/tracefile-tfile.c b/gdb/tracefile-tfile.c
index 5c3837ec5b..c5063e66b0 100644
--- a/gdb/tracefile-tfile.c
+++ b/gdb/tracefile-tfile.c
@@ -616,8 +616,7 @@  tfile_interp_line (char *line, struct uploaded_tp **utpp,
 void
 tfile_target::close ()
 {
-  if (trace_fd < 0)
-    return;
+  gdb_assert (trace_fd != -1);
 
   inferior_ptid = null_ptid;	/* Avoid confusion from thread stuff.  */
   exit_inferior_silent (current_inferior ());