Skip to content

Commit b84ac58

Browse files
committed
[ORC] Rename MachOCompactUnwindSectionName to MachOUnwindInfoSectionName.
a1ff2d1 should have disambiguated MachOCompactUnwindInfoSectionName to MachOUnwindInfoSectionName, given how it's used in MachOPlatform and its value. A MachOCompactUnwindSectionName variable with an appropriate value will be added in an upcoming patch to re-enable compact-unwind support in JITLink.
1 parent 88e7b8b commit b84ac58

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
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,6 @@ namespace orc {
2525
extern StringRef MachODataCommonSectionName;
2626
extern StringRef MachODataDataSectionName;
2727
extern StringRef MachOEHFrameSectionName;
28-
extern StringRef MachOCompactUnwindSectionName;
2928
extern StringRef MachOCStringSectionName;
3029
extern StringRef MachOModInitFuncSectionName;
3130
extern StringRef MachOObjCCatListSectionName;
@@ -53,6 +52,7 @@ extern StringRef MachOTextTextSectionName;
5352
extern StringRef MachOThreadBSSSectionName;
5453
extern StringRef MachOThreadDataSectionName;
5554
extern StringRef MachOThreadVarsSectionName;
55+
extern StringRef MachOUnwindInfoSectionName;
5656

5757
extern StringRef MachOInitSectionNames[22];
5858

llvm/lib/ExecutionEngine/Orc/MachOPlatform.cpp

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

1281-
if (Section *CUInfoSec = G.findSectionByName(MachOCompactUnwindSectionName))
1281+
if (Section *CUInfoSec = G.findSectionByName(MachOUnwindInfoSectionName))
12821282
ScanUnwindInfoSection(*CUInfoSec, US.CompactUnwindSection);
12831283

12841284
// 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,6 @@ namespace orc {
1818
StringRef MachODataCommonSectionName = "__DATA,__common";
1919
StringRef MachODataDataSectionName = "__DATA,__data";
2020
StringRef MachOEHFrameSectionName = "__TEXT,__eh_frame";
21-
StringRef MachOCompactUnwindSectionName = "__TEXT,__unwind_info";
2221
StringRef MachOCStringSectionName = "__TEXT,__cstring";
2322
StringRef MachOModInitFuncSectionName = "__DATA,__mod_init_func";
2423
StringRef MachOObjCCatListSectionName = "__DATA,__objc_catlist";
@@ -46,6 +45,7 @@ StringRef MachOTextTextSectionName = "__TEXT,__text";
4645
StringRef MachOThreadBSSSectionName = "__DATA,__thread_bss";
4746
StringRef MachOThreadDataSectionName = "__DATA,__thread_data";
4847
StringRef MachOThreadVarsSectionName = "__DATA,__thread_vars";
48+
StringRef MachOUnwindInfoSectionName = "__TEXT,__unwind_info";
4949

5050
StringRef MachOInitSectionNames[22] = {
5151
MachOModInitFuncSectionName, MachOObjCCatListSectionName,

0 commit comments

Comments
 (0)