Skip to content

Commit a1ff2d1

Browse files
committed
[ORC] Drop 'Info' from MachOCompactUnwindInfoSectionName.
Rename MachOCompactUnwindInfoSectionName to MachOCompactUnwindSectionName. Background: There are two related sections used for compact-unwind info processing: __LD,__compact_unwind -- the input table stored in relocatable object formats, and __TEXT,__unwind_info -- the compressed table produced by the linker and consumed by libunwind. To keep the distinction clear we'll use *CompactUnwind* for names that refer to the __LD,__compact_unwind input tables and *UnwindInfo* for names that refer to the __TEXT,__unwind_info output tables. Dropping 'Info' from the variable above clarifies which section it refers to.
1 parent 7fb233f commit a1ff2d1

File tree

3 files changed

+3
-4
lines changed

3 files changed

+3
-4
lines changed

llvm/include/llvm/ExecutionEngine/Orc/Shared/MachOObjectFormat.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ namespace orc {
2525
extern StringRef MachODataCommonSectionName;
2626
extern StringRef MachODataDataSectionName;
2727
extern StringRef MachOEHFrameSectionName;
28-
extern StringRef MachOCompactUnwindInfoSectionName;
28+
extern StringRef MachOCompactUnwindSectionName;
2929
extern StringRef MachOCStringSectionName;
3030
extern StringRef MachOModInitFuncSectionName;
3131
extern StringRef MachOObjCCatListSectionName;

llvm/lib/ExecutionEngine/Orc/MachOPlatform.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1278,8 +1278,7 @@ MachOPlatform::MachOPlatformPlugin::findUnwindSectionInfo(
12781278
if (Section *EHFrameSec = G.findSectionByName(MachOEHFrameSectionName))
12791279
ScanUnwindInfoSection(*EHFrameSec, US.DwarfSection);
12801280

1281-
if (Section *CUInfoSec =
1282-
G.findSectionByName(MachOCompactUnwindInfoSectionName))
1281+
if (Section *CUInfoSec = G.findSectionByName(MachOCompactUnwindSectionName))
12831282
ScanUnwindInfoSection(*CUInfoSec, US.CompactUnwindSection);
12841283

12851284
// If we didn't find any pointed-to code-blocks then there's no need to

llvm/lib/ExecutionEngine/Orc/Shared/MachOObjectFormat.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ namespace orc {
1818
StringRef MachODataCommonSectionName = "__DATA,__common";
1919
StringRef MachODataDataSectionName = "__DATA,__data";
2020
StringRef MachOEHFrameSectionName = "__TEXT,__eh_frame";
21-
StringRef MachOCompactUnwindInfoSectionName = "__TEXT,__unwind_info";
21+
StringRef MachOCompactUnwindSectionName = "__TEXT,__unwind_info";
2222
StringRef MachOCStringSectionName = "__TEXT,__cstring";
2323
StringRef MachOModInitFuncSectionName = "__DATA,__mod_init_func";
2424
StringRef MachOObjCCatListSectionName = "__DATA,__objc_catlist";

0 commit comments

Comments
 (0)