[binutils-gdb] Fix bug in previous remote unique_ptr change

[binutils-gdb] Fix bug in previous remote unique_ptr change

[Pedro Alves]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=aed77b16f17fc3ed9c952af632674dc25d0dfdb5

commit aed77b16f17fc3ed9c952af632674dc25d0dfdb5
Author: Pedro Alves <pedro@palves.net>
Date:   Wed Dec 20 20:11:23 2023 +0000

    Fix bug in previous remote unique_ptr change
    
    By inspection, I noticed that the previous patch went too far, here:
    
     @@ -7705,7 +7713,8 @@ remote_target::discard_pending_stop_replies (struct inferior *inf)
        if (rs->remote_desc == NULL)
          return;
    
     -  reply = (struct stop_reply *) rns->pending_event[notif_client_stop.id];
     +  stop_reply_up reply
     +    = as_stop_reply_up (std::move (rns->pending_event[notif_client_stop.id]));
    
        /* Discard the in-flight notification.  */
        if (reply != NULL && reply->ptid.pid () == inf->pid)
    
    That is always moving the stop reply from pending_event, when we only
    really want to peek into it.  The code further below that even says:
    
      /* Discard the in-flight notification.  */
      if (reply != NULL && reply->ptid.pid () == inf->pid)
        {
          /* Leave the notification pending, since the server expects that
             we acknowledge it with vStopped.  But clear its contents, so
             that later on when we acknowledge it, we also discard it.  */
    
    This commit reverts that hunk back, adjusted to use unique_ptr::get().
    
    Change-Id: Ifc809d1a8225150a4656889f056d51267100ee24

Diff:
---
 gdb/remote.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gdb/remote.c b/gdb/remote.c
index f3823bb9c76..dcc1a0d0639 100644
--- a/gdb/remote.c
+++ b/gdb/remote.c
@@ -7713,8 +7713,9 @@ remote_target::discard_pending_stop_replies (struct inferior *inf)
   if (rs->remote_desc == NULL)
     return;
 
-  stop_reply_up reply
-    = as_stop_reply_up (std::move (rns->pending_event[notif_client_stop.id]));
+  struct notif_event *notif_event
+    = rns->pending_event[notif_client_stop.id].get ();
+  auto *reply = static_cast<stop_reply *> (notif_event);
 
   /* Discard the in-flight notification.  */
   if (reply != NULL && reply->ptid.pid () == inf->pid)