[Lldb-commits] [lldb] 1490f87 - Roll back Michał's changes to debugserver, not meant for there

[Jason Molenda via lldb-commits]

Author: Jason Molenda
Date: 2022-06-21T12:57:42-07:00
New Revision: 1490f87154fb31222903a05f6d64c0508016f55c

URL: https://github.com/llvm/llvm-project/commit/1490f87154fb31222903a05f6d64c0508016f55c
DIFF: https://github.com/llvm/llvm-project/commit/1490f87154fb31222903a05f6d64c0508016f55c.diff

LOG: Roll back Michał's changes to debugserver, not meant for there

Michał's change in https://reviews.llvm.org/D127193 did a search &
replace for a pattern that also appears in debugserver, but it
shouldn't be done there.

Added: 
    

Modified: 
    lldb/tools/debugserver/source/RNBRemote.cpp

Removed: 
    


################################################################################
diff  --git a/lldb/tools/debugserver/source/RNBRemote.cpp b/lldb/tools/debugserver/source/RNBRemote.cpp
index 3043f03c47a59..ebb2125524e9c 100644
--- a/lldb/tools/debugserver/source/RNBRemote.cpp
+++ b/lldb/tools/debugserver/source/RNBRemote.cpp
@@ -2704,7 +2704,7 @@ rnb_err_t RNBRemote::SendStopReplyPacketForThread(nub_thread_t tid) {
     std::ostringstream ostrm;
     // Output the T packet with the thread
     ostrm << 'T';
-    int signum = tid_stop_info.signo;
+    int signum = tid_stop_info.details.signal.signo;
     DNBLogThreadedIf(
         LOG_RNB_PROC, "%8d %s got signal signo = %u, exc_type = %u",
         (uint32_t)m_comm.Timer().ElapsedMicroSeconds(true), __FUNCTION__,
@@ -5450,9 +5450,9 @@ RNBRemote::GetJSONThreadsInfo(bool threads_with_valid_stop_info_only) {
           break;
 
         case eStopTypeSignal:
-          if (tid_stop_info.signo != 0) {
+          if (tid_stop_info.details.signal.signo != 0) {
             thread_dict_sp->AddIntegerItem("signal",
-                                           tid_stop_info.signo);
+                                           tid_stop_info.details.signal.signo);
             reason_value = "signal";
           }
           break;