This is an archive of the discontinued LLVM Phabricator instance.

Differential D51517

Do not leak the Mach host port in sys::getHostCPUName()
ClosedPublic

Authored by rsesek on Aug 30 2018, 3:09 PM.

Details

Reviewers
chandlerc
kristina
Summary

Patch by: rsesek

Diff Detail

Event Timeline

rsesek created this revision.Aug 30 2018, 3:09 PM
Herald added a subscriber: llvm-commits. · View Herald TranscriptAug 30 2018, 3:09 PM
Harbormaster completed remote builds in B22121: Diff 163425.Aug 30 2018, 3:09 PM
kristina added a subscriber: kristina.EditedSep 3 2018, 5:26 PM

Good catch, mach_host_self() always obtains a new send right for the host port. The naming doesn't match the rest of the file style but that's from before, would be nice to squeeze that change in if Chandler is okay with style change going in with a functional change. Regardless, LGTM.

kristina accepted this revision.Sep 4 2018, 3:51 AM
This revision is now accepted and ready to land.Sep 4 2018, 3:51 AM
kristina closed this revision.Sep 4 2018, 4:29 AM
kristina added a comment.Sep 4 2018, 6:10 AM

Closed by rL341357.

Revision Contents

PathSize
lib/
Support/
4 lines

Diff 163425

lib/Support/Host.cpp

Show First 20 Lines • Show All 1,016 Lines • ▼ Show 20 Lines
} }
#elif defined(__APPLE__) && (defined(__ppc__) || defined(__powerpc__)) #elif defined(__APPLE__) && (defined(__ppc__) || defined(__powerpc__))
StringRef sys::getHostCPUName() { StringRef sys::getHostCPUName() {
host_basic_info_data_t hostInfo; host_basic_info_data_t hostInfo;
mach_msg_type_number_t infoCount; mach_msg_type_number_t infoCount;
infoCount = HOST_BASIC_INFO_COUNT; infoCount = HOST_BASIC_INFO_COUNT;
host_info(mach_host_self(), HOST_BASIC_INFO, (host_info_t)&hostInfo, mach_port_t hostPort = mach_host_self();
host_info(hostPort, HOST_BASIC_INFO, (host_info_t)&hostInfo,
&infoCount); &infoCount);
mach_port_deallocate(mach_task_self(), hostPort);
if (hostInfo.cpu_type != CPU_TYPE_POWERPC) if (hostInfo.cpu_type != CPU_TYPE_POWERPC)
return "generic"; return "generic";
switch (hostInfo.cpu_subtype) { switch (hostInfo.cpu_subtype) {
case CPU_SUBTYPE_POWERPC_601: case CPU_SUBTYPE_POWERPC_601:
return "601"; return "601";
case CPU_SUBTYPE_POWERPC_602: case CPU_SUBTYPE_POWERPC_602:
▲ Show 20 Lines • Show All 341 Lines • Show Last 20 Lines