Revert the ObjectFileJSON changes, will land separately.

Author: jasonmolenda

lldb/source/Plugins/ObjectFile/JSON/ObjectFileJSON.cpp

@@ -12,7 +12,6 @@
 #include "lldb/Core/PluginManager.h"
 #include "lldb/Core/Section.h"
 #include "lldb/Symbol/Symbol.h"
-#include "lldb/Target/Target.h"
 #include "lldb/Utility/LLDBLog.h"
 #include "lldb/Utility/Log.h"
 #include "llvm/ADT/DenseSet.h"
@@ -234,41 +233,6 @@ void ObjectFileJSON::CreateSections(SectionList &unified_section_list) {
   }
 }
 
-bool ObjectFileJSON::SetLoadAddress(Target &target, lldb::addr_t value,
-                                    bool value_is_offset) {
-  Log *log(GetLog(LLDBLog::DynamicLoader));
-  if (!m_sections_up)
-    return true;
-
-  const bool warn_multiple = true;
-
-  addr_t slide = value;
-  if (!value_is_offset) {
-    addr_t lowest_addr = LLDB_INVALID_ADDRESS;
-    for (const SectionSP &section_sp : *m_sections_up) {
-      addr_t section_load_addr = section_sp->GetFileAddress();
-      lowest_addr = std::min(lowest_addr, section_load_addr);
-    }
-    if (lowest_addr == LLDB_INVALID_ADDRESS)
-      return false;
-    slide = value - lowest_addr;
-  }
-
-  // Apply slide to each section's file address.
-  for (const SectionSP &section_sp : *m_sections_up) {
-    addr_t section_load_addr = section_sp->GetFileAddress();
-    if (section_load_addr != LLDB_INVALID_ADDRESS) {
-      LLDB_LOGF(
-          log,
-          "ObjectFileJSON::SetLoadAddress section %s to load addr 0x%" PRIx64,
-          section_sp->GetName().AsCString(), section_load_addr + slide);
-      target.SetSectionLoadAddress(section_sp, section_load_addr + slide,
-                                   warn_multiple);
-    }
-  }
-  return true;
-}
-
 bool ObjectFileJSON::MagicBytesMatch(DataBufferSP data_sp,
                                      lldb::addr_t data_offset,
                                      lldb::addr_t data_length) {

lldb/source/Plugins/ObjectFile/JSON/ObjectFileJSON.h

@@ -86,9 +86,6 @@ class ObjectFileJSON : public ObjectFile {
 
   Strata CalculateStrata() override { return eStrataUser; }
 
-  bool SetLoadAddress(Target &target, lldb::addr_t value,
-                      bool value_is_offset) override;
-
   static bool MagicBytesMatch(lldb::DataBufferSP data_sp, lldb::addr_t offset,
                               lldb::addr_t length);