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 2d18e3e4399aa6b49a80a3eae82664b420a2f804..49501dfd4f2edf52933d35ea0fccd62841114708 100644 (file)
--- 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 1ceb03e6918ec418c119a52da284380d7619d67b..977c0dab06b0c8b94867ea7538060d469f668b79 100644 (file)
--- 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 ());