intel/llvm
1
0
Fork 0
mirror of https://github.com/intel/llvm.git synced 2026-01-16 05:32:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

[MachO] Update embedded part of ObjectFileMachO for Mangled API change

Browse Source 
Mangled::GetName and Mangled::GetDemangledName no longer take any
arguments.
This commit is contained in:
Jonas Devlieghere
2020-11-18 14:46:26 -08:00
parent 0e2585c804
commit f3aa9e36d9
1 changed files with 24 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp
View File

@@ -3032,12 +3032,10 @@ size_t ObjectFileMachO::ParseSymtab() {
// contains just the filename, so here we combine
// it with the first one if we are minimizing the
// symbol table
const char *so_path =
sym[sym_idx - 1]
.GetMangled()
.GetDemangledName(
lldb::eLanguageTypeUnknown)
.AsCString();
const char *so_path = sym[sym_idx - 1]
.GetMangled()
.GetDemangledName()
.AsCString();
if (so_path && so_path[0]) {
std::string full_so_path(so_path);
const size_t double_slash_pos =
@@ -3469,12 +3467,10 @@ size_t ObjectFileMachO::ParseSymtab() {
sym[sym_idx].GetMangled().SetValue(
const_symbol_name, symbol_name_is_mangled);
if (is_gsym && is_debug) {
const char *gsym_name =
sym[sym_idx]
.GetMangled()
.GetName(lldb::eLanguageTypeUnknown,
Mangled::ePreferMangled)
.GetCString();
const char *gsym_name = sym[sym_idx]
.GetMangled()
.GetName()
.GetCString();
if (gsym_name)
N_GSYM_name_to_sym_idx[gsym_name] = sym_idx;
}
@@ -3554,12 +3550,8 @@ size_t ObjectFileMachO::ParseSymtab() {
bool found_it = false;
for (auto pos = range.first; pos != range.second;
++pos) {
if (sym[sym_idx].GetMangled().GetName(
lldb::eLanguageTypeUnknown,
Mangled::ePreferMangled) ==
sym[pos->second].GetMangled().GetName(
lldb::eLanguageTypeUnknown,
Mangled::ePreferMangled)) {
if (sym[sym_idx].GetMangled().GetName() ==
sym[pos->second].GetMangled().GetName()) {
m_nlist_idx_to_sym_idx[nlist_idx] = pos->second;
// We just need the flags from the linker
// symbol, so put these flags
@@ -3599,12 +3591,8 @@ size_t ObjectFileMachO::ParseSymtab() {
bool found_it = false;
for (auto pos = range.first; pos != range.second;
++pos) {
if (sym[sym_idx].GetMangled().GetName(
lldb::eLanguageTypeUnknown,
Mangled::ePreferMangled) ==
sym[pos->second].GetMangled().GetName(
lldb::eLanguageTypeUnknown,
Mangled::ePreferMangled)) {
if (sym[sym_idx].GetMangled().GetName() ==
sym[pos->second].GetMangled().GetName()) {
m_nlist_idx_to_sym_idx[nlist_idx] = pos->second;
// We just need the flags from the linker
// symbol, so put these flags
@@ -3622,12 +3610,10 @@ size_t ObjectFileMachO::ParseSymtab() {
if (found_it)
continue;
} else {
const char *gsym_name =
sym[sym_idx]
.GetMangled()
.GetName(lldb::eLanguageTypeUnknown,
Mangled::ePreferMangled)
.GetCString();
const char *gsym_name = sym[sym_idx]
.GetMangled()
.GetName()
.GetCString();
if (gsym_name) {
// Combine N_GSYM stab entries with the non
// stab symbol
@@ -4348,10 +4334,8 @@ size_t ObjectFileMachO::ParseSymtab() {
}
if (is_gsym) {
const char *gsym_name = sym[sym_idx]
.GetMangled()
.GetName(Mangled::ePreferMangled)
.GetCString();
const char *gsym_name =
sym[sym_idx].GetMangled().GetName().GetCString();
if (gsym_name)
N_GSYM_name_to_sym_idx[gsym_name] = sym_idx;
}
@@ -4415,9 +4399,8 @@ size_t ObjectFileMachO::ParseSymtab() {
if (range.first != range.second) {
for (ValueToSymbolIndexMap::const_iterator pos = range.first;
pos != range.second; ++pos) {
if (sym[sym_idx].GetMangled().GetName(Mangled::ePreferMangled) ==
sym[pos->second].GetMangled().GetName(
Mangled::ePreferMangled)) {
if (sym[sym_idx].GetMangled().GetName() ==
sym[pos->second].GetMangled().GetName()) {
m_nlist_idx_to_sym_idx[nlist_idx] = pos->second;
// We just need the flags from the linker symbol, so put these
// flags into the N_FUN flags to avoid duplicate symbols in the
@@ -4450,9 +4433,8 @@ size_t ObjectFileMachO::ParseSymtab() {
if (range.first != range.second) {
for (ValueToSymbolIndexMap::const_iterator pos = range.first;
pos != range.second; ++pos) {
if (sym[sym_idx].GetMangled().GetName(Mangled::ePreferMangled) ==
sym[pos->second].GetMangled().GetName(
Mangled::ePreferMangled)) {
if (sym[sym_idx].GetMangled().GetName() ==
sym[pos->second].GetMangled().GetName()) {
m_nlist_idx_to_sym_idx[nlist_idx] = pos->second;
// We just need the flags from the linker symbol, so put these
// flags into the N_STSYM flags to avoid duplicate symbols in
@@ -4465,10 +4447,8 @@ size_t ObjectFileMachO::ParseSymtab() {
}
} else {
// Combine N_GSYM stab entries with the non stab symbol.
const char *gsym_name = sym[sym_idx]
.GetMangled()
.GetName(Mangled::ePreferMangled)
.GetCString();
const char *gsym_name =
sym[sym_idx].GetMangled().GetName().GetCString();
if (gsym_name) {
ConstNameToSymbolIndexMap::const_iterator pos =
N_GSYM_name_to_sym_idx.find(gsym_name);