[Lldb-commits] [lldb] 623e845 - Recognize BSS-only DATA segments as sections that need to be slid

[Jason Molenda via lldb-commits]

Author: Jason Molenda
Date: 2023-06-29T17:51:41-07:00
New Revision: 623e8455919af69b039fe7450118ba953423a027

URL: https://github.com/llvm/llvm-project/commit/623e8455919af69b039fe7450118ba953423a027
DIFF: https://github.com/llvm/llvm-project/commit/623e8455919af69b039fe7450118ba953423a027.diff

LOG: Recognize BSS-only DATA segments as sections that need to be slid

ObjectFileMachO::SetLoadAddress() should allow for a DATA segment
that has no file content to be slid in the vmaddr, it is valid
to have such a section.

Differential Revision: https://reviews.llvm.org/D154037
rdar://99744343

Added: 
    lldb/test/API/macosx/bss-only-data-section-sliding/Makefile
    lldb/test/API/macosx/bss-only-data-section-sliding/TestBSSOnlyDataSectionSliding.py
    lldb/test/API/macosx/bss-only-data-section-sliding/main.c

Modified: 
    lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp

Removed: 
    


################################################################################
diff  --git a/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp b/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp
index ce904b0a9c7a00..cab93f5b471f26 100644
--- a/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp
+++ b/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp
@@ -6048,7 +6048,8 @@ bool ObjectFileMachO::SectionIsLoadable(const Section *section) {
   if (!section)
     return false;
   const bool is_dsym = (m_header.filetype == MH_DSYM);
-  if (section->GetFileSize() == 0 && !is_dsym)
+  if (section->GetFileSize() == 0 && !is_dsym &&
+      section->GetName() != GetSegmentNameDATA())
     return false;
   if (section->IsThreadSpecific())
     return false;

diff  --git a/lldb/test/API/macosx/bss-only-data-section-sliding/Makefile b/lldb/test/API/macosx/bss-only-data-section-sliding/Makefile
new file mode 100644
index 00000000000000..10495940055b63
--- /dev/null
+++ b/lldb/test/API/macosx/bss-only-data-section-sliding/Makefile
@@ -0,0 +1,3 @@
+C_SOURCES := main.c
+
+include Makefile.rules

diff  --git a/lldb/test/API/macosx/bss-only-data-section-sliding/TestBSSOnlyDataSectionSliding.py b/lldb/test/API/macosx/bss-only-data-section-sliding/TestBSSOnlyDataSectionSliding.py
new file mode 100644
index 00000000000000..bc7d69a592e3da
--- /dev/null
+++ b/lldb/test/API/macosx/bss-only-data-section-sliding/TestBSSOnlyDataSectionSliding.py
@@ -0,0 +1,27 @@
+"""Test that we a BSS-data only DATA segment is slid with other segments."""
+
+import lldb
+from lldbsuite.test.decorators import *
+from lldbsuite.test.lldbtest import *
+from lldbsuite.test import lldbutil
+
+
+class TestBSSOnlyDataSectionSliding(TestBase):
+    @skipUnlessDarwin
+    def test_with_python_api(self):
+        """Test that we get thread names when interrupting a process."""
+        self.build()
+        exe = self.getBuildArtifact("a.out")
+
+        target = self.dbg.CreateTarget(exe, "", "", False, lldb.SBError())
+        self.assertTrue(target, VALID_TARGET)
+
+        module = target.modules[0]
+        self.assertTrue(module.IsValid())
+        data_sect = module.section["__DATA"]
+        self.assertTrue(data_sect.IsValid())
+
+        target.SetModuleLoadAddress(module, 0x170000000)
+        self.assertEqual(
+            data_sect.GetFileAddress() + 0x170000000, data_sect.GetLoadAddress(target)
+        )

diff  --git a/lldb/test/API/macosx/bss-only-data-section-sliding/main.c b/lldb/test/API/macosx/bss-only-data-section-sliding/main.c
new file mode 100644
index 00000000000000..14cf307c684e11
--- /dev/null
+++ b/lldb/test/API/macosx/bss-only-data-section-sliding/main.c
@@ -0,0 +1,2 @@
+int glob = 0;
+int main() { return glob; }