This is an archive of the discontinued LLVM Phabricator instance.

Differential D156838

[lldb] Re-add compile-time checks for SPI in HosInfoMacOSX
ClosedPublic

Authored by bulbazord on Aug 1 2023, 5:27 PM.

Details

Reviewers
JDevlieghere
mib
jasonmolenda
jingham
Commits
rG6c2e3249160f: [lldb] Re-add compile-time checks for SPI in HosInfoMacOSX
Summary

There were some checks removed previously in
bc196970b549782bffde5fdbfa450c565af11fc1.

However, all these SPIs are actually defined in macOS 12 and onward, not
macOSX 10.12 as the previous commit would suggest. As a result, if you
have access to these SPIs lldb will fail to compile correctly.

Instead of adding back the __builtin_availability checks, it seems
easier just to check the minimum deployment target with Availability
macros.

Diff Detail

Event Timeline

bulbazord created this revision.Aug 1 2023, 5:27 PM
Herald added a project: Restricted Project. · View Herald TranscriptAug 1 2023, 5:27 PM
bulbazord requested review of this revision.Aug 1 2023, 5:27 PM
Herald added a project: Restricted Project. · View Herald TranscriptAug 1 2023, 5:27 PM
Herald added a subscriber: lldb-commits. · View Herald Transcript
jasonmolenda accepted this revision.Aug 1 2023, 5:29 PM

Ah, I missed that I removed the check when we were trying to clean up old pre-macOS 10.12 ifdef's. LGTM thanks!

This revision is now accepted and ready to land.Aug 1 2023, 5:29 PM
Harbormaster completed remote builds in B249640: Diff 546278.Aug 1 2023, 5:30 PM
JDevlieghere accepted this revision.Aug 1 2023, 5:43 PM
Closed by commit rG6c2e3249160f: [lldb] Re-add compile-time checks for SPI in HosInfoMacOSX (authored by bulbazord). · Explain WhyAug 2 2023, 10:22 AM
This revision was automatically updated to reflect the committed changes.
bulbazord added a commit: rG6c2e3249160f: [lldb] Re-add compile-time checks for SPI in HosInfoMacOSX.

Revision Contents

PathSize
lldb/
source/
Host/
macosx/
objcxx/
5 lines

Diff 546533

lldb/source/Host/macosx/objcxx/HostInfoMacOSX.mm

Show All 28 Lines
// C inclues // C inclues
#include <cstdlib> #include <cstdlib>
#include <sys/sysctl.h> #include <sys/sysctl.h>
#include <sys/syslimits.h> #include <sys/syslimits.h>
#include <sys/types.h> #include <sys/types.h>
#include <uuid/uuid.h> #include <uuid/uuid.h>
// Objective-C/C++ includes // Objective-C/C++ includes
#include <AvailabilityMacros.h>
#include <CoreFoundation/CoreFoundation.h> #include <CoreFoundation/CoreFoundation.h>
#include <Foundation/Foundation.h> #include <Foundation/Foundation.h>
#include <mach-o/dyld.h> #include <mach-o/dyld.h>
#if defined(MAC_OS_X_VERSION_MIN_REQUIRED) && \
MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_VERSION_12_0
#if __has_include(<mach-o/dyld_introspection.h>) #if __has_include(<mach-o/dyld_introspection.h>)
#include <mach-o/dyld_introspection.h> #include <mach-o/dyld_introspection.h>
#define SDK_HAS_NEW_DYLD_INTROSPECTION_SPIS #define SDK_HAS_NEW_DYLD_INTROSPECTION_SPIS
#endif #endif
#endif
#include <objc/objc-auto.h> #include <objc/objc-auto.h>
// These are needed when compiling on systems // These are needed when compiling on systems
// that do not yet have these definitions // that do not yet have these definitions
#include <AvailabilityMacros.h>
#ifndef CPU_SUBTYPE_X86_64_H #ifndef CPU_SUBTYPE_X86_64_H
#define CPU_SUBTYPE_X86_64_H ((cpu_subtype_t)8) #define CPU_SUBTYPE_X86_64_H ((cpu_subtype_t)8)
#endif #endif
#ifndef CPU_TYPE_ARM64 #ifndef CPU_TYPE_ARM64
#define CPU_TYPE_ARM64 (CPU_TYPE_ARM | CPU_ARCH_ABI64) #define CPU_TYPE_ARM64 (CPU_TYPE_ARM | CPU_ARCH_ABI64)
#endif #endif
#ifndef CPU_TYPE_ARM64_32 #ifndef CPU_TYPE_ARM64_32
▲ Show 20 Lines • Show All 639 Lines • Show Last 20 Lines