Unverified Commit 491e8ced authored by Jason Molenda's avatar Jason Molenda Committed by GitHub
Browse files

[lldb][debugserver] Don't duplicate loaded binaries in jStopInfo (#195343) 

RNBRemote::GetJSONThreadsInfo() has a bool mode switch: Only
exception-related information information about threads which had an
exception, or full information about all threads. The exception-related
information is what ends up in the `jstopinfo` key in the stop packet,
asciihex encoded. The full information is what is sent for the
`jThreadsInfo` packet, with full information for all threads at a public
stop.

When I added the `added-binaries` and `detailed-binaries-info` keys to
the thread description, I incorrectly put this in the exception related
block of this method. Move that in to the "full information" section of
the method, so we don't duplicate the information that is included in
the stop packet, asciihex encoded at that.

rdar://176001611
parent b87b0945

lldb/tools/debugserver/source/RNBRemote.cpp

+21 −21
Original line number Diff line number Diff line
@@ -5856,7 +5856,6 @@ RNBRemote::GetJSONThreadsInfo(bool threads_with_valid_stop_info_only) { 
          }

          thread_dict_sp->AddItem("memory", memory_array_sp);

        }

      }



        std::vector<uint64_t> added_binaries;

        JSONGenerator::ObjectSP detailed_binary_infos;
@@ -5879,6 +5878,7 @@ RNBRemote::GetJSONThreadsInfo(bool threads_with_valid_stop_info_only) { 
            thread_dict_sp->AddItem("detailed-binaries-info",

                                    detailed_binary_infos);

        }

      }



      threads_array_sp->AddItem(thread_dict_sp);

    }