Skip to content

Commit 954c6b5

Browse files
author
Davide Italiano
committed
[DYLDRendezvous] Remove code that doesn't exist upstream.
Folks on llvm.org are trying to reinstate this code, and when that will happen, we'll get this code on swift-lldb for free. apple-llvm-split-commit: 2a4d55cc63e2c11c328959d2269718954755397c apple-llvm-split-dir: lldb/
1 parent 2a1c851 commit 954c6b5

File tree

1 file changed

+0
-24
lines changed

1 file changed

+0
-24
lines changed

lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DYLDRendezvous.cpp

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -516,30 +516,6 @@ bool DYLDRendezvous::ReadSOEntryFromMemory(lldb::addr_t addr, SOEntry &entry) {
516516

517517
UpdateBaseAddrIfNecessary(entry, file_path);
518518

519-
// The base_addr is not filled in for some case.
520-
// Try to figure it out based on the load address of the object file.
521-
// The issue observed for '/system/bin/linker' on Android L (5.0, 5.1)
522-
if (entry.base_addr == 0) {
523-
lldb::addr_t load_addr = LLDB_INVALID_ADDRESS;
524-
bool is_loaded = false;
525-
Status error =
526-
m_process->GetFileLoadAddress(entry.file_spec, is_loaded, load_addr);
527-
if (error.Success() && is_loaded)
528-
entry.base_addr = load_addr;
529-
}
530-
531-
// The base_addr is not filled in for some case.
532-
// Try to figure it out based on the load address of the object file.
533-
// The issue observed for '/system/bin/linker' on Android L (5.0, 5.1)
534-
if (entry.base_addr == 0) {
535-
lldb::addr_t load_addr = LLDB_INVALID_ADDRESS;
536-
bool is_loaded = false;
537-
Status error =
538-
m_process->GetFileLoadAddress(entry.file_spec, is_loaded, load_addr);
539-
if (error.Success() && is_loaded)
540-
entry.base_addr = load_addr;
541-
}
542-
543519
return true;
544520
}
545521

0 commit comments

Comments
 (0)