Author: Lang Hames Date: 2025-02-08T16:19:50Z New Revision: 4abac9fbfdcdf63c221ecdd83eadaa8f578b5d1e
URL: https://github.com/llvm/llvm-project/commit/4abac9fbfdcdf63c221ecdd83eadaa8f578b5d1e DIFF: https://github.com/llvm/llvm-project/commit/4abac9fbfdcdf63c221ecdd83eadaa8f578b5d1e.diff LOG: [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. (cherry picked from commit a1ff2d18466bc27d3dc9b8bba688454e2a1cf196) Added: Modified: llvm/include/llvm/ExecutionEngine/Orc/Shared/MachOObjectFormat.h llvm/lib/ExecutionEngine/Orc/MachOPlatform.cpp llvm/lib/ExecutionEngine/Orc/Shared/MachOObjectFormat.cpp Removed: ################################################################################ diff --git a/llvm/include/llvm/ExecutionEngine/Orc/Shared/MachOObjectFormat.h b/llvm/include/llvm/ExecutionEngine/Orc/Shared/MachOObjectFormat.h index b927dfbce992a0d..31d0ecca2080595 100644 --- a/llvm/include/llvm/ExecutionEngine/Orc/Shared/MachOObjectFormat.h +++ b/llvm/include/llvm/ExecutionEngine/Orc/Shared/MachOObjectFormat.h @@ -25,7 +25,7 @@ namespace orc { extern StringRef MachODataCommonSectionName; extern StringRef MachODataDataSectionName; extern StringRef MachOEHFrameSectionName; -extern StringRef MachOCompactUnwindInfoSectionName; +extern StringRef MachOCompactUnwindSectionName; extern StringRef MachOCStringSectionName; extern StringRef MachOModInitFuncSectionName; extern StringRef MachOObjCCatListSectionName; diff --git a/llvm/lib/ExecutionEngine/Orc/MachOPlatform.cpp b/llvm/lib/ExecutionEngine/Orc/MachOPlatform.cpp index 48d54190fafb6ae..9479a69d4f0ba05 100644 --- a/llvm/lib/ExecutionEngine/Orc/MachOPlatform.cpp +++ b/llvm/lib/ExecutionEngine/Orc/MachOPlatform.cpp @@ -1278,8 +1278,7 @@ MachOPlatform::MachOPlatformPlugin::findUnwindSectionInfo( if (Section *EHFrameSec = G.findSectionByName(MachOEHFrameSectionName)) ScanUnwindInfoSection(*EHFrameSec, US.DwarfSection); - if (Section *CUInfoSec = - G.findSectionByName(MachOCompactUnwindInfoSectionName)) + if (Section *CUInfoSec = G.findSectionByName(MachOCompactUnwindSectionName)) ScanUnwindInfoSection(*CUInfoSec, US.CompactUnwindSection); // If we didn't find any pointed-to code-blocks then there's no need to diff --git a/llvm/lib/ExecutionEngine/Orc/Shared/MachOObjectFormat.cpp b/llvm/lib/ExecutionEngine/Orc/Shared/MachOObjectFormat.cpp index 11e8eb7bc3a19b1..be92acd37aa8de3 100644 --- a/llvm/lib/ExecutionEngine/Orc/Shared/MachOObjectFormat.cpp +++ b/llvm/lib/ExecutionEngine/Orc/Shared/MachOObjectFormat.cpp @@ -18,7 +18,7 @@ namespace orc { StringRef MachODataCommonSectionName = "__DATA,__common"; StringRef MachODataDataSectionName = "__DATA,__data"; StringRef MachOEHFrameSectionName = "__TEXT,__eh_frame"; -StringRef MachOCompactUnwindInfoSectionName = "__TEXT,__unwind_info"; +StringRef MachOCompactUnwindSectionName = "__TEXT,__unwind_info"; StringRef MachOCStringSectionName = "__TEXT,__cstring"; StringRef MachOModInitFuncSectionName = "__DATA,__mod_init_func"; StringRef MachOObjCCatListSectionName = "__DATA,__objc_catlist"; _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
