Undo format

Author: Jeffrey Tan

lldb/include/lldb/Core/LoadedModuleInfoList.h

@@ -27,11 +27,6 @@ class LoadedModuleInfoList {
       e_has_base,
       e_has_dynamic,
       e_has_link_map,
-      e_has_uuid,
-      e_has_file_offset,
-      e_has_file_size,
-      e_has_native_memory_address,
-      e_has_native_memory_size,
       e_num
     };
 
@@ -82,51 +77,6 @@ class LoadedModuleInfoList {
       return m_has[e_has_dynamic];
     }
 
-    void set_uuid(const std::string &uuid) {
-      m_uuid_str = uuid;
-      m_has[e_has_uuid] = true;
-    }
-    bool get_uuid(std::string &out) const {
-      out = m_uuid_str;
-      return m_has[e_has_uuid];
-    }
-
-    void set_file_offset(uint64_t offset) {
-      m_file_offset = offset;
-      m_has[e_has_file_offset] = true;
-    }
-    bool get_file_offset(uint64_t &out) const {
-      out = m_file_offset;
-      return m_has[e_has_file_offset];
-    }
-
-    void set_file_size(uint64_t size) {
-      m_file_size = size;
-      m_has[e_has_file_size] = true;
-    }
-    bool get_file_size(uint64_t &out) const {
-      out = m_file_size;
-      return m_has[e_has_file_size];
-    }
-
-    void set_native_memory_address(lldb::addr_t addr) {
-      m_native_memory_address = addr;
-      m_has[e_has_native_memory_address] = true;
-    }
-    bool get_native_memory_address(lldb::addr_t &out) const {
-      out = m_native_memory_address;
-      return m_has[e_has_native_memory_address];
-    }
-
-    void set_native_memory_size(lldb::addr_t size) {
-      m_native_memory_size = size;
-      m_has[e_has_native_memory_size] = true;
-    }
-    bool get_native_memory_size(lldb::addr_t &out) const {
-      out = m_native_memory_size;
-      return m_has[e_has_native_memory_size];
-    }
-
     bool has_info(e_data_point datum) const {
       assert(datum < e_num);
       return m_has[datum];
@@ -139,12 +89,7 @@ class LoadedModuleInfoList {
       }
 
       return (m_base == rhs.m_base) && (m_link_map == rhs.m_link_map) &&
-             (m_dynamic == rhs.m_dynamic) && (m_name == rhs.m_name) &&
-             (m_uuid_str == rhs.m_uuid_str) &&
-             (m_file_offset == rhs.m_file_offset) &&
-             (m_file_size == rhs.m_file_size) &&
-             (m_native_memory_address == rhs.m_native_memory_address) &&
-             (m_native_memory_size == rhs.m_native_memory_size);
+             (m_dynamic == rhs.m_dynamic) && (m_name == rhs.m_name);
     }
 
   protected:
@@ -154,11 +99,6 @@ class LoadedModuleInfoList {
     lldb::addr_t m_base = LLDB_INVALID_ADDRESS;
     bool m_base_is_offset = false;
     lldb::addr_t m_dynamic = LLDB_INVALID_ADDRESS;
-    std::string m_uuid_str;
-    uint64_t m_file_offset = 0;
-    uint64_t m_file_size = 0;
-    lldb::addr_t m_native_memory_address = LLDB_INVALID_ADDRESS;
-    lldb::addr_t m_native_memory_size = 0;
   };
 
   LoadedModuleInfoList() = default;

lldb/include/lldb/Target/Target.h

@@ -1458,6 +1458,7 @@ class Target : public std::enable_shared_from_this<Target>,
       ScriptBased,
       CodeBased,
     };
+
     enum class StopHookResult : uint32_t {
       KeepStopped = 0,
       RequestContinue,

lldb/source/Plugins/Process/elf-core/ProcessElfCore.cpp

@@ -434,7 +434,7 @@ size_t ProcessElfCore::DoReadMemory(lldb::addr_t addr, void *buf, size_t size,
   const lldb::addr_t file_start = address_range->data.GetRangeBase();
   const lldb::addr_t file_end = address_range->data.GetRangeEnd();
   size_t bytes_to_read = size; // Number of bytes to read from the core file
-  size_t bytes_copied = 0; // Number of bytes actually read from the core file
+  size_t bytes_copied = 0;   // Number of bytes actually read from the core file
   lldb::addr_t bytes_left =
       0; // Number of bytes available in the core file from the given address
 
@@ -517,7 +517,8 @@ lldb::addr_t ProcessElfCore::GetImageInfoAddress() {
 
 // Parse a FreeBSD NT_PRSTATUS note - see FreeBSD sys/procfs.h for details.
 static void ParseFreeBSDPrStatus(ThreadData &thread_data,
-                                 const DataExtractor &data, bool lp64) {
+                                 const DataExtractor &data,
+                                 bool lp64) {
   lldb::offset_t offset = 0;
   int pr_version = data.GetU32(&offset);
 
@@ -544,7 +545,8 @@ static void ParseFreeBSDPrStatus(ThreadData &thread_data,
 
 // Parse a FreeBSD NT_PRPSINFO note - see FreeBSD sys/procfs.h for details.
 static void ParseFreeBSDPrPsInfo(ProcessElfCore &process,
-                                 const DataExtractor &data, bool lp64) {
+                                 const DataExtractor &data,
+                                 bool lp64) {
   lldb::offset_t offset = 0;
   int pr_version = data.GetU32(&offset);
 
@@ -563,7 +565,8 @@ static void ParseFreeBSDPrPsInfo(ProcessElfCore &process,
 }
 
 static llvm::Error ParseNetBSDProcInfo(const DataExtractor &data,
-                                       uint32_t &cpi_nlwps, uint32_t &cpi_signo,
+                                       uint32_t &cpi_nlwps,
+                                       uint32_t &cpi_signo,
                                        uint32_t &cpi_siglwp,
                                        uint32_t &cpi_pid) {
   lldb::offset_t offset = 0;
@@ -731,8 +734,8 @@ llvm::Error ProcessElfCore::parseNetBSDNotes(llvm::ArrayRef<CoreNote> notes) {
 
     if (name == "NetBSD-CORE") {
       if (note.info.n_type == NETBSD::NT_PROCINFO) {
-        llvm::Error error =
-            ParseNetBSDProcInfo(note.data, nlwps, signo, siglwp, pr_pid);
+        llvm::Error error = ParseNetBSDProcInfo(note.data, nlwps, signo,
+                                                siglwp, pr_pid);
         if (error)
           return error;
         SetID(pr_pid);
@@ -958,9 +961,7 @@ llvm::Error ProcessElfCore::parseLinuxNotes(llvm::ArrayRef<CoreNote> notes) {
       Status status = prpsinfo.Parse(note.data, arch);
       if (status.Fail())
         return status.ToError();
-      thread_data.name.assign(
-          prpsinfo.pr_fname,
-          strnlen(prpsinfo.pr_fname, sizeof(prpsinfo.pr_fname)));
+      thread_data.name.assign (prpsinfo.pr_fname, strnlen (prpsinfo.pr_fname, sizeof (prpsinfo.pr_fname)));
       SetID(prpsinfo.pr_pid);
       m_executable_name = thread_data.name;
       break;
@@ -1015,7 +1016,7 @@ llvm::Error ProcessElfCore::ParseThreadContextsFromNoteSegment(
   assert(segment_header.p_type == llvm::ELF::PT_NOTE);
 
   auto notes_or_error = parseSegment(segment_data);
-  if (!notes_or_error)
+  if(!notes_or_error)
     return notes_or_error.takeError();
   switch (GetArchitecture().GetTriple().getOS()) {
   case llvm::Triple::FreeBSD: