Skip to content

Work around a bug in the interaction between newer dyld's and older simulator dyld's #78004

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 16, 2024
Merged

Work around a bug in the interaction between newer dyld's and older simulator dyld's #78004

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions lldb/tools/debugserver/source/MacOSX/MachProcess.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
#include <algorithm>
#include <chrono>
#include <map>
#include <unordered_set>

#include <TargetConditionals.h>
#import <Foundation/Foundation.h>
Expand Down Expand Up @@ -1053,9 +1054,16 @@ static bool mach_header_validity_test(uint32_t magic, uint32_t cputype) {
dyld_process_info info =
m_dyld_process_info_create(m_task.TaskPort(), 0, &kern_ret);
if (info) {
// There's a bug in the interaction between dyld and older dyld_sim's
// (e.g. from the iOS 15 simulator) that causes dyld to report the same
// binary twice. We use this set to eliminate the duplicates.
__block std::unordered_set<uint64_t> seen_header_addrs;
m_dyld_process_info_for_each_image(
info,
^(uint64_t mach_header_addr, const uuid_t uuid, const char *path) {
auto res_pair = seen_header_addrs.insert(mach_header_addr);
if (!res_pair.second)
return;
struct binary_image_information image;
image.filename = path;
uuid_copy(image.macho_info.uuid, uuid);
Expand Down