Skip to content

[arm64] Bring this branch in a compilable state. #291

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 1 commit into from
Nov 12, 2019
Merged

[arm64] Bring this branch in a compilable state. #291

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 6 additions & 4 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 @@ -2677,8 +2677,7 @@ size_t ObjectFileMachO::ParseSymtab() {

// Next we need to determine the correct path for the dyld shared cache.

ArchSpec header_arch;
GetArchitecture(header_arch);
ArchSpec header_arch = GetArchitecture();
char dsc_path[PATH_MAX];
char dsc_path_development[PATH_MAX];

Expand Down Expand Up @@ -2876,9 +2875,12 @@ size_t ObjectFileMachO::ParseSymtab() {
nlist_index++) {
/////////////////////////////
{
struct nlist_64 nlist;
if (!ParseNList(dsc_local_symbols_data, nlist_data_offset, nlist_byte_size, nlist)
llvm::Optional<struct nlist_64> nlist_maybe =
ParseNList(dsc_local_symbols_data, nlist_data_offset,
nlist_byte_size);
if (!nlist_maybe)
break;
struct nlist_64 nlist = *nlist_maybe;

SymbolType type = eSymbolTypeInvalid;
const char *symbol_name = dsc_local_symbols_data.PeekCStr(
Expand Down