[binutils-gdb] tfile_target::close: trace_fd can't be -1

[gdb-buildbot@sergiodj.net]

*** TEST RESULTS FOR COMMIT c17e02e1b55b5e9cbdc6581f05bfec96dc8436f4 ***

commit c17e02e1b55b5e9cbdc6581f05bfec96dc8436f4
Author:     Pedro Alves <palves@redhat.com>
AuthorDate: Fri Jan 10 20:05:50 2020 +0000
Commit:     Pedro Alves <palves@redhat.com>
CommitDate: Fri Jan 10 20:05:50 2020 +0000

    tfile_target::close: trace_fd can't be -1
    
    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:
    2020-01-10  Pedro Alves  <palves@redhat.com>
    
            * tracefile-tfile.c (tfile_target::close): Assert that trace_fd is
            not -1.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 2d18e3e439..49501dfd4f 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2020-01-10  Pedro Alves  <palves@redhat.com>
+
+	* tracefile-tfile.c (tfile_target::close): Assert that trace_fd is
+	not -1.
+
 2020-01-10  Pedro Alves  <palves@redhat.com>
 
 	* break-catch-sig.c (signal_catchpoint_print_it): Don't pass a
diff --git a/gdb/tracefile-tfile.c b/gdb/tracefile-tfile.c
index 1ceb03e691..977c0dab06 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 ());