Skip to content

[lldb][MachO][NFC] Extract ObjC metadata symbol parsing into helper function #161536

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 6 commits into from
Oct 1, 2025
Merged

[lldb][MachO][NFC] Extract ObjC metadata symbol parsing into helper function #161536

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f4e7b75
[lldb][test] Allow '.c' files to be used as shell tests
Michael137 Oct 1, 2025
24007ee
[lldb][MachO] Fix inspection of global variables that start with 'O'
Michael137 Oct 1, 2025
9cda8da
[lldb][MachO][NFC] Extract ObjC metadata symbol parsing into helper f…
Michael137 Oct 1, 2025
6426f64
fixup! revert rename
Michael137 Oct 1, 2025
fdba582
Merge branch 'main' into lldb/objc-symbol-parsing-refactor
Michael137 Oct 1, 2025
c898a98
fixup! add back missing brace
Michael137 Oct 1, 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
178 changes: 54 additions & 124 deletions lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2067,6 +2067,43 @@ static bool ParseTrieEntries(DataExtractor &data, lldb::offset_t offset,
return true;
}

static bool
TryParseV2ObjCMetadataSymbol(const char *&symbol_name,
const char *&symbol_name_non_abi_mangled,
SymbolType &type) {
static constexpr llvm::StringLiteral g_objc_v2_prefix_class("_OBJC_CLASS_$_");
static constexpr llvm::StringLiteral g_objc_v2_prefix_metaclass(
"_OBJC_METACLASS_$_");
static constexpr llvm::StringLiteral g_objc_v2_prefix_ivar("_OBJC_IVAR_$_");

llvm::StringRef symbol_name_ref(symbol_name);
if (symbol_name_ref.empty())
return false;

if (symbol_name_ref.starts_with(g_objc_v2_prefix_class)) {
symbol_name_non_abi_mangled = symbol_name + 1;
symbol_name = symbol_name + g_objc_v2_prefix_class.size();
type = eSymbolTypeObjCClass;
return true;
}

if (symbol_name_ref.starts_with(g_objc_v2_prefix_metaclass)) {
symbol_name_non_abi_mangled = symbol_name + 1;
symbol_name = symbol_name + g_objc_v2_prefix_metaclass.size();
type = eSymbolTypeObjCMetaClass;
return true;
}

if (symbol_name_ref.starts_with(g_objc_v2_prefix_ivar)) {
symbol_name_non_abi_mangled = symbol_name + 1;
symbol_name = symbol_name + g_objc_v2_prefix_ivar.size();
type = eSymbolTypeObjCIVar;
return true;
}

return false;
}

static SymbolType GetSymbolType(const char *&symbol_name,
bool &demangled_is_synthesized,
const SectionSP &text_section_sp,
Expand Down Expand Up @@ -2183,9 +2220,6 @@ void ObjectFileMachO::ParseSymtab(Symtab &symtab) {
lldb::offset_t offset = MachHeaderSizeFromMagic(m_header.magic);
uint32_t i;
FileSpecList dylib_files;
llvm::StringRef g_objc_v2_prefix_class("_OBJC_CLASS_$_");
llvm::StringRef g_objc_v2_prefix_metaclass("_OBJC_METACLASS_$_");
llvm::StringRef g_objc_v2_prefix_ivar("_OBJC_IVAR_$_");
UUID image_uuid;

for (i = 0; i < m_header.ncmds; ++i) {
Expand Down Expand Up @@ -2805,33 +2839,13 @@ void ObjectFileMachO::ParseSymtab(Symtab &symtab) {
is_gsym = true;
sym[sym_idx].SetExternal(true);

llvm::StringRef symbol_name_ref(symbol_name);
if (symbol_name_ref.starts_with(
g_objc_v2_prefix_class)) {
symbol_name_non_abi_mangled = symbol_name + 1;
symbol_name =
symbol_name + g_objc_v2_prefix_class.size();
type = eSymbolTypeObjCClass;
demangled_is_synthesized = true;

} else if (symbol_name_ref.starts_with(
g_objc_v2_prefix_metaclass)) {
symbol_name_non_abi_mangled = symbol_name + 1;
symbol_name =
symbol_name + g_objc_v2_prefix_metaclass.size();
type = eSymbolTypeObjCMetaClass;
if (TryParseV2ObjCMetadataSymbol(
symbol_name, symbol_name_non_abi_mangled,
type)) {
demangled_is_synthesized = true;
} else if (symbol_name_ref.starts_with(
g_objc_v2_prefix_ivar)) {
symbol_name_non_abi_mangled = symbol_name + 1;
symbol_name =
symbol_name + g_objc_v2_prefix_ivar.size();
type = eSymbolTypeObjCIVar;
demangled_is_synthesized = true;
} else {
if (nlist.n_value != 0)
symbol_section = section_info.GetSection(
nlist.n_sect, nlist.n_value);
} else if (nlist.n_value != 0) {
symbol_section = section_info.GetSection(
nlist.n_sect, nlist.n_value);
type = eSymbolTypeData;
}
break;
Expand Down Expand Up @@ -3316,49 +3330,10 @@ void ObjectFileMachO::ParseSymtab(Symtab &symtab) {
::strstr(symbol_sect_name, "__objc") ==
symbol_sect_name) {
type = eSymbolTypeRuntime;

if (symbol_name) {
llvm::StringRef symbol_name_ref(symbol_name);
if (symbol_name_ref.starts_with("_OBJC_")) {
llvm::StringRef
g_objc_v2_prefix_class(
"_OBJC_CLASS_$_");
llvm::StringRef
g_objc_v2_prefix_metaclass(
"_OBJC_METACLASS_$_");
llvm::StringRef
g_objc_v2_prefix_ivar("_OBJC_IVAR_$_");
if (symbol_name_ref.starts_with(
g_objc_v2_prefix_class)) {
symbol_name_non_abi_mangled =
symbol_name + 1;
symbol_name =
symbol_name +
g_objc_v2_prefix_class.size();
type = eSymbolTypeObjCClass;
demangled_is_synthesized = true;
} else if (
symbol_name_ref.starts_with(
g_objc_v2_prefix_metaclass)) {
symbol_name_non_abi_mangled =
symbol_name + 1;
symbol_name =
symbol_name +
g_objc_v2_prefix_metaclass.size();
type = eSymbolTypeObjCMetaClass;
demangled_is_synthesized = true;
} else if (symbol_name_ref.starts_with(
g_objc_v2_prefix_ivar)) {
symbol_name_non_abi_mangled =
symbol_name + 1;
symbol_name =
symbol_name +
g_objc_v2_prefix_ivar.size();
type = eSymbolTypeObjCIVar;
demangled_is_synthesized = true;
}
}
}
demangled_is_synthesized =
TryParseV2ObjCMetadataSymbol(
symbol_name,
symbol_name_non_abi_mangled, type);
} else if (symbol_sect_name &&
::strstr(symbol_sect_name,
"__gcc_except_tab") ==
Expand Down Expand Up @@ -3665,27 +3640,12 @@ void ObjectFileMachO::ParseSymtab(Symtab &symtab) {
is_gsym = true;
sym[sym_idx].SetExternal(true);

llvm::StringRef symbol_name_ref(symbol_name);
if (symbol_name_ref.starts_with(g_objc_v2_prefix_class)) {
symbol_name_non_abi_mangled = symbol_name + 1;
symbol_name = symbol_name + g_objc_v2_prefix_class.size();
type = eSymbolTypeObjCClass;
demangled_is_synthesized = true;

} else if (symbol_name_ref.starts_with(g_objc_v2_prefix_metaclass)) {
symbol_name_non_abi_mangled = symbol_name + 1;
symbol_name = symbol_name + g_objc_v2_prefix_metaclass.size();
type = eSymbolTypeObjCMetaClass;
if (TryParseV2ObjCMetadataSymbol(symbol_name,
symbol_name_non_abi_mangled, type)) {
demangled_is_synthesized = true;
} else if (symbol_name_ref.starts_with(g_objc_v2_prefix_ivar)) {
symbol_name_non_abi_mangled = symbol_name + 1;
symbol_name = symbol_name + g_objc_v2_prefix_ivar.size();
type = eSymbolTypeObjCIVar;
demangled_is_synthesized = true;
} else {
if (nlist.n_value != 0)
symbol_section =
section_info.GetSection(nlist.n_sect, nlist.n_value);
} else if (nlist.n_value != 0) {
symbol_section =
section_info.GetSection(nlist.n_sect, nlist.n_value);
type = eSymbolTypeData;
}
} break;
Expand Down Expand Up @@ -4123,39 +4083,9 @@ void ObjectFileMachO::ParseSymtab(Symtab &symtab) {
if (symbol_sect_name &&
::strstr(symbol_sect_name, "__objc") == symbol_sect_name) {
type = eSymbolTypeRuntime;
demangled_is_synthesized = TryParseV2ObjCMetadataSymbol(
symbol_name, symbol_name_non_abi_mangled, type);

if (symbol_name) {
llvm::StringRef symbol_name_ref(symbol_name);
if (symbol_name_ref.starts_with("_OBJC_")) {
llvm::StringRef g_objc_v2_prefix_class(
"_OBJC_CLASS_$_");
llvm::StringRef g_objc_v2_prefix_metaclass(
"_OBJC_METACLASS_$_");
llvm::StringRef g_objc_v2_prefix_ivar(
"_OBJC_IVAR_$_");
if (symbol_name_ref.starts_with(g_objc_v2_prefix_class)) {
symbol_name_non_abi_mangled = symbol_name + 1;
symbol_name =
symbol_name + g_objc_v2_prefix_class.size();
type = eSymbolTypeObjCClass;
demangled_is_synthesized = true;
} else if (symbol_name_ref.starts_with(
g_objc_v2_prefix_metaclass)) {
symbol_name_non_abi_mangled = symbol_name + 1;
symbol_name =
symbol_name + g_objc_v2_prefix_metaclass.size();
type = eSymbolTypeObjCMetaClass;
demangled_is_synthesized = true;
} else if (symbol_name_ref.starts_with(
g_objc_v2_prefix_ivar)) {
symbol_name_non_abi_mangled = symbol_name + 1;
symbol_name =
symbol_name + g_objc_v2_prefix_ivar.size();
type = eSymbolTypeObjCIVar;
demangled_is_synthesized = true;
}
}
}
} else if (symbol_sect_name &&
::strstr(symbol_sect_name, "__gcc_except_tab") ==
symbol_sect_name) {
Expand Down
Loading