Skip to content

[lldb] Properly cache the result of MachProcess::GetPlatform #140611

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

Closed
wants to merge 2 commits into from
Closed

[lldb] Properly cache the result of MachProcess::GetPlatform #140611

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c385e97
[lldb] Properly cache the result of MachProcess::GetPlatform #140610
talkeren May 19, 2025
bc775be
fix formatting
talkeren May 19, 2025
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
2 changes: 1 addition & 1 deletion lldb/tools/debugserver/source/MacOSX/MachProcess.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,7 @@ class MachProcess {

pid_t m_pid; // Process ID of child process
cpu_type_t m_cpu_type; // The CPU type of this process
uint32_t m_platform; // The platform of this process
std::optional<uint32_t> m_platform; // The platform of this process
int m_child_stdin;
int m_child_stdout;
int m_child_stderr;
Expand Down
8 changes: 4 additions & 4 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 @@ -1039,9 +1039,9 @@ static bool mach_header_validity_test(uint32_t magic, uint32_t cputype) {
};

uint32_t MachProcess::GetPlatform() {
if (m_platform == 0)
if (!m_platform)
m_platform = MachProcess::GetProcessPlatformViaDYLDSPI();
return m_platform;
return *m_platform;
}

uint32_t MachProcess::GetProcessPlatformViaDYLDSPI() {
Expand Down Expand Up @@ -1323,7 +1323,7 @@ static bool mach_header_validity_test(uint32_t magic, uint32_t cputype) {
// Clear any cached thread list while the pid and task are still valid

m_task.Clear();
m_platform = 0;
m_platform.reset();
// Now clear out all member variables
m_pid = INVALID_NUB_PROCESS;
if (!detaching)
Expand Down Expand Up @@ -1754,7 +1754,7 @@ static uint64_t bits(uint64_t value, uint32_t msbit, uint32_t lsbit) {

// NULL our task out as we have already restored all exception ports
m_task.Clear();
m_platform = 0;
m_platform.reset();

// Clear out any notion of the process we once were
const bool detaching = true;
Expand Down
Loading