Skip to content

Commit b145d96

Browse files
committed
CI: Bump LDC-LLVM to v20.1.5 RC
1 parent 1ae8018 commit b145d96

File tree

3 files changed

+11
-8
lines changed

3 files changed

+11
-8
lines changed

.github/actions/1-setup/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ runs:
2323
2424
packages=( \
2525
git-core cmake g++ \
26-
libcurl4 libxml2-dev libzstd-dev \
26+
libcurl4 libzstd-dev \
2727
curl gdb p7zip-full tzdata unzip zip python3-pip \
2828
)
2929
if [[ $arch == x86_64 ]]; then

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ concurrency:
1414
cancel-in-progress: true
1515

1616
env:
17-
LLVM_VERSION: 20.1.4
17+
LLVM_VERSION: a905655f
1818

1919
jobs:
2020
build-native:

driver/targetmachine.cpp

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,15 +51,18 @@
5151
#endif
5252

5353
#ifdef LDC_LLVM_SUPPORTS_MACHO_DWARF_LINE_AS_REGULAR_SECTION
54-
// LDC-LLVM >= 6.0.1:
55-
// On Mac, emit __debug_line section in __DWARF segment as regular (non-debug)
56-
// section, like DMD, to enable file/line infos in backtraces. See
54+
// LDC-LLVM >= 20:
55+
// On Darwin, emit __debug_line section in __DWARF segment as regular
56+
// (non-debug) section, like DMD, to enable file/line infos in backtraces
57+
// without having to resort to an atos process. See
58+
// https://github.com/ldc-developers/ldc/issues/4895
5759
// https://github.com/dlang/dmd/commit/2bf7d0db29416eacbb01a91e6502140e354ee0ef
58-
// https://github.com/ldc-developers/llvm-project/commit/110deda1bc1cf195983fea8c1107886057987955
60+
// https://github.com/ldc-developers/llvm-project/commit/356e996bd217afd883adf3da5fe9a16c1102b273
5961
static llvm::cl::opt<bool, true> preserveDwarfLineSection(
6062
"preserve-dwarf-line-section",
61-
llvm::cl::desc("Mac: preserve DWARF line section during linking for "
62-
"file/line infos in backtraces. Defaults to true."),
63+
llvm::cl::desc("Darwin: preserve DWARF __debug_line section during linking "
64+
"for builtin file/line infos in backtraces without having "
65+
"to resort to an atos process."),
6366
llvm::cl::Hidden, llvm::cl::ZeroOrMore,
6467
llvm::cl::location(ldc::emitMachODwarfLineAsRegularSection),
6568
llvm::cl::init(false));

0 commit comments

Comments
 (0)