Merge pull request #1955 from dcci/andr

apple-llvm-split-commit: a8659fb0d58ee95a427f1b3fe4f6f32d7cb7b98c
apple-llvm-split-dir: lldb/

Author: swift-ci

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

@@ -516,30 +516,6 @@ bool DYLDRendezvous::ReadSOEntryFromMemory(lldb::addr_t addr, SOEntry &entry) {
 
   UpdateBaseAddrIfNecessary(entry, file_path);
 
-  // The base_addr is not filled in for some case.
-  // Try to figure it out based on the load address of the object file.
-  // The issue observed for '/system/bin/linker' on Android L (5.0, 5.1)
-  if (entry.base_addr == 0) {
-    lldb::addr_t load_addr = LLDB_INVALID_ADDRESS;
-    bool is_loaded = false;
-    Status error =
-        m_process->GetFileLoadAddress(entry.file_spec, is_loaded, load_addr);
-    if (error.Success() && is_loaded)
-      entry.base_addr = load_addr;
-  }
-
-  // The base_addr is not filled in for some case.
-  // Try to figure it out based on the load address of the object file.
-  // The issue observed for '/system/bin/linker' on Android L (5.0, 5.1)
-  if (entry.base_addr == 0) {
-    lldb::addr_t load_addr = LLDB_INVALID_ADDRESS;
-    bool is_loaded = false;
-    Status error =
-        m_process->GetFileLoadAddress(entry.file_spec, is_loaded, load_addr);
-    if (error.Success() && is_loaded)
-      entry.base_addr = load_addr;
-  }
-
   return true;
 }