Ditto for Mach-O, and *way* simplify the parsing!

brandtbucher · brandtbucher · commit c4c3cccfa1df · 2025-07-17T15:28:24.000-07:00
diff --git a/Tools/jit/_schema.py b/Tools/jit/_schema.py
@@ -101,7 +101,7 @@ class ELFSection(typing.TypedDict):
     Index: int
     Info: int
     Relocations: list[dict[typing.Literal["Relocation"], ELFRelocation]]
-    SectionData: dict[typing.Literal["Bytes"], list[int]]
+    SectionData: typing.NotRequired[dict[typing.Literal["Bytes"], list[int]]]
     Size: int
     Symbols: list[dict[typing.Literal["Symbol"], _ELFSymbol]]
     Type: dict[typing.Literal["Name"], str]
@@ -118,4 +118,6 @@ class MachOSection(typing.TypedDict):
         list[dict[typing.Literal["Relocation"], MachORelocation]]
     ]
     SectionData: typing.NotRequired[dict[typing.Literal["Bytes"], list[int]]]
+    Segment: dict[typing.Literal["Value"], str]
+    Size: int
     Symbols: typing.NotRequired[list[dict[typing.Literal["Symbol"], _MachOSymbol]]]
diff --git a/Tools/jit/_targets.py b/Tools/jit/_targets.py
@@ -400,6 +400,7 @@ def _handle_section(
                 value = _stencils.HoleValue.DATA
                 stencil = group.data
             if section_type == "SHT_PROGBITS":
+                assert "SectionData" in section
                 section_data_bytes = section["SectionData"]["Bytes"]
             else:
                 # Zeroed BSS data:
@@ -474,7 +475,11 @@ def _handle_section(
         self, section: _schema.MachOSection, group: _stencils.StencilGroup
     ) -> None:
         assert section["Address"] >= len(group.code.body)
-        assert "SectionData" in section
+        if "SectionData" in section:
+            section_data_bytes = section["SectionData"]["Bytes"]
+        else:
+            # Zeroed BSS data:
+            section_data_bytes = [0] * section["Size"]
         flags = {flag["Name"] for flag in section["Attributes"]["Flags"]}
         name = section["Name"]["Value"]
         name = name.removeprefix(self.symbol_prefix)
@@ -483,23 +488,23 @@ def _handle_section(
         if "PureInstructions" in flags:
             value = _stencils.HoleValue.CODE
             stencil = group.code
-            start_address = 0
-            group.symbols[name] = value, section["Address"] - start_address
         else:
             value = _stencils.HoleValue.DATA
             stencil = group.data
-            start_address = len(group.code.body)
-            group.symbols[name] = value, len(group.code.body)
-        base = section["Address"] - start_address
+        segment = section["Segment"]["Value"]
+        if segment == "__DATA":
+            value = _stencils.HoleValue.WRITABLE
+            section_data_bytes = []
+        else:
+            assert segment == "__TEXT", segment
+        base = len(stencil.body)
+        group.symbols[name] = value, base
         group.symbols[section["Index"]] = value, base
-        stencil.body.extend(
-            [0] * (section["Address"] - len(group.code.body) - len(group.data.body))
-        )
-        stencil.body.extend(section["SectionData"]["Bytes"])
+        stencil.body.extend(section_data_bytes)
         assert "Symbols" in section
         for wrapped_symbol in section["Symbols"]:
             symbol = wrapped_symbol["Symbol"]
-            offset = symbol["Value"] - start_address
+            offset = symbol["Value"] - section["Address"] + base
             name = symbol["Name"]["Name"]
             name = name.removeprefix(self.symbol_prefix)
             group.symbols[name] = value, offset
