Skip to content

Commit 2f158bd

Browse files
authored
Merge pull request #4868 from kinke/merge_stable
Merge upstream v2.110.0
2 parents 9f4184e + b5744ba commit 2f158bd

File tree

9 files changed

+21
-8
lines changed

9 files changed

+21
-8
lines changed

.cirrus.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ packaging_steps_template: &PACKAGING_STEPS_TEMPLATE
109109
# Build & copy reggae
110110
build_reggae_script: |
111111
cd $CIRRUS_WORKING_DIR/..
112-
git clone --recursive https://github.com/kinke/reggae.git
112+
git clone --recursive https://github.com/atilaneves/reggae.git
113113
cd reggae
114114
git checkout "$(cat $CIRRUS_WORKING_DIR/packaging/reggae_version)"
115115
# needs rdmd in PATH

.github/actions/4d-test-libs/action.yml

+2
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ runs:
2626
excludes+='|^std.math.exponential(-shared)?$'
2727
# FIXME: subtest rt_trap_exceptions fails
2828
excludes+='|^druntime-test-exceptions-debug$'
29+
# FIXME: sporadically hanging
30+
excludes+='|^core.thread-shared$'
2931
fi
3032
3133
ctest -j$N --output-on-failure -E "$excludes" --timeout 120

.github/actions/7-package/action.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ runs:
6565
run: |
6666
set -eux
6767
cd ..
68-
git clone --recursive https://github.com/kinke/reggae.git
68+
git clone --recursive https://github.com/atilaneves/reggae.git
6969
cd reggae
7070
git checkout "$(cat ../ldc/packaging/reggae_version)"
7171

CHANGELOG.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# LDC master
22

33
#### Big news
4-
- Latest frontend and druntime patches from DMD stable (v2.110.0-rc.1+). (#4854)
4+
- Frontend and druntime bumped to version [2.110.0](https://dlang.org/changelog/2.110.0.html) final. (#4854, #4868)
55
- LLVM for prebuilt packages bumped to v19.1.7. (#4822)
66
- New prebuilt package for Alpine Linux x86_64 with musl libc. It's currently generated on Alpine v3.21, using its default LLVM 19. Most bundled executables are fully static and can be run on ~all distros. (#4826, #4862)
77
- Revived dynamic-compile (JIT) functionality (formerly unsupported since LLVM 12), supporting LLVM 18+ now. (#4774)
@@ -10,7 +10,7 @@
1010

1111
#### Platform support
1212
- Supports LLVM 15 - 19.
13-
- Initial compiler and runtime support for ppc64 and ppc64le systems that use IEEE 754R 128-bit floating-point as the default 128-bit floating-point format. (#4833)
13+
- Initial compiler and runtime support for ppc64 and ppc64le systems that use IEEE 754R 128-bit floating-point as the default 128-bit floating-point format. (#4833, #4840)
1414
- Initial support for Windows on ARM64. The prebuilt Windows multilib package/installer bundles prebuilt arm64 druntime and Phobos; cross-compiling works out of the box via `-mtriple=aarch64-windows-msvc`, but you currently need to set up a suited MSVC arm64 build environment before yourself (e.g., by running `vsdevcmd.bat -arch=arm64 -host_arch=x64`). (#4835, #4846)
1515

1616
#### Bug fixes

CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ include(GetLinuxDistribution)
117117
#
118118

119119
# Version information
120-
set(LDC_VERSION "1.40.0") # May be overridden by git hash tag
120+
set(LDC_VERSION "1.40.1") # May be overridden by git hash tag
121121
set(DMDFE_MAJOR_VERSION 2)
122122
set(DMDFE_MINOR_VERSION 110)
123123
set(DMDFE_PATCH_VERSION 0)

packaging/dlang-tools_version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v2.110.0-rc.1
1+
v2.110.0

packaging/dub_version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4a69bd4b8ec74175cc83f3a0edc1ceb15822377c
1+
v1.39.0

packaging/reggae_version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
5d9cc590d0e0cd3d143f433fdfe8f3d13e540d23
1+
c8fb508ec6b042a21723c807acfa768cfb691383

tests/dmd/runnable/template3.d

+11
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,16 @@ void test8()
240240

241241
/*********************************************************/
242242

243+
// https://github.com/dlang/dmd/issues/20907
244+
struct Bar { enum bar = 1; }
245+
void foo(A)(A[], A[1 << A.bar]) {}
246+
void test20907()
247+
{
248+
foo((Bar[]).init, (Bar[2]).init);
249+
}
250+
251+
/*********************************************************/
252+
243253
int main()
244254
{
245255
test1();
@@ -250,6 +260,7 @@ int main()
250260
test6();
251261
test7();
252262
test8();
263+
test20907();
253264

254265
printf("Success\n");
255266
return 0;

0 commit comments

Comments
 (0)