Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge stable into master #13279

Merged
merged 20 commits into from Nov 8, 2021
Merged

Merge stable into master #13279

merged 20 commits into from Nov 8, 2021

Conversation

PetarKirov
Copy link
Member

@PetarKirov PetarKirov commented Nov 8, 2021

Motivation for doing it early:

  • We should strive to keep the list of bug fixes in stable not included in master to zero
  • Less chance of merge conflicts when done often
  • Less risky release process (alternatively, the regular stable -> master merge may become a bottleneck)
  • Include @ibuclaw's upgrade to macOS 11.x for the bootstrap task on CirrusCI

Requires:


Done with: https://github.com/wilzbach/git-tools/blob/master/merge_stable

WalterBright and others added 18 commits October 23, 2021 19:28
The GitHub workflow is setting LD_LIBRARY_PATH to the host dmd library
folder with libphobos2.so. The tests are built using a new phobos. They
select the library path using -L-rpath, which sets DT_RUNPATH on the
binary, but LD_LIBRARY_PATH has priority over DT_RUNPATH.
For tests/dshell/dll_cxx.d this caused a link failure, because a new
symbol from phobos was not found in the older phobos.
Reseting LD_LIBRARY_PATH while running the tests makes sure, that the
new phobos is used.
FreeBSD has had fmodl since 8.0 (2008)
DragonFly BSD has had fmodl since 4.1 (2013)
The special casing to use fmod instead of fmodl can be removed.
Fix Issue 22461 - OpenBSD: Use fmodl
The old error message (`return expression expected`) ignored the
possibility that `void` and `noreturn` expressions are moved into `e0`.
This caused misleading error messages when errors are detected after
the move, claiming that the expression found in the source code is
missing.

Small improvement to dlang#13135 because this is more likely to happen for
`noreturn` functions.
Fix Issue 22475 - OpenBSD: Disable test/compilable/cdcmp.d on OpenBSD
Fix Issue 22477 - OpenBSD: Add to fail_compilation/fail3753.d ignore list
Fix Issue 22476 - OpenBSD: Add OpenBSD to the fail_compilation/fail21227_win.d ignore list
…position for subsequent members, producing extra errors
@dlang-bot
Copy link
Contributor

Thanks for your pull request, @PetarKirov!

Bugzilla references

Auto-close Bugzilla Severity Description
20133 regression [REG2.084.0] Bogus slice assignment in recursive CTFE call
20998 regression error in static struct initialization causes wrong position for subsequent members, producing extra errors
21039 regression `alias this` returns 'null' for ref types when put into array initializer
21093 critical [ICE] AssertError@dmd/optimize.d(691): Assertion failure
21380 regression A case of compiler crash when using auto ref
21930 normal ICE (illegal instruction) with bad code
22461 minor OpenBSD: Use fmodl
22462 trivial OpenBSD: bash lives in /usr/local
22463 major OpenBSD: Allow DMD to work on 32-bit OpenBSD
22472 regression Invalid error message for `void` return from non-`void` functions
22474 enhancement OpenBSD: Add support to test/runnable/dhry.d
22475 enhancement OpenBSD: Disable test/compilable/cdcmp.d on OpenBSD
22476 enhancement OpenBSD: Add OpenBSD to the fail_compilation/fail21227_win.d ignore list
22477 enhancement OpenBSD: Add to fail_compilation/fail3753.d ignore list
22478 enhancement OpenBSD: Add to fail_compilation/invalid_lib.d

Testing this PR locally

If you don't have a local development environment setup, you can use Digger to test this PR:

dub run digger -- build "master + dmd#13279"

…h PR dlang#13195


[PR dlang#13195][1] allows the return type of `main` to be inferred. This PR was
merged in `master` while `test/fail_compilation/test21930` was introduced in the
meantime on `master by [PR dlang#13234][2]. So, as of dlang#13195, it's no longer an error
to omit the return type of `main` and the `TEST_OUTPUT` of
`fail_compilation/test21930` is no longer correct. This commit fixes that after
the `stable` -> `master` merge.

[1]: dlang#13195
[2]: dlang#13234

Co-authored-by: Florian <moonlightsentinel@disroot.org>
@PetarKirov PetarKirov marked this pull request as ready for review November 8, 2021 18:11
@dlang-bot dlang-bot merged commit e174cf6 into dlang:master Nov 8, 2021
@PetarKirov PetarKirov deleted the merge_stable branch November 8, 2021 21:36
PetarKirov added a commit to PetarKirov/druntime that referenced this pull request Nov 8, 2021
Now that dlang/dmd#13279 is merged we can finally switch to macOS BigSur
on Cirrus CI on `master`.

This reverts commit 2985abd.
dlang-bot pushed a commit to dlang/druntime that referenced this pull request Nov 8, 2021
Now that dlang/dmd#13279 is merged we can finally switch to macOS BigSur
on Cirrus CI on `master`.

This reverts commit 2985abd.
@PetarKirov PetarKirov mentioned this pull request Nov 9, 2021
2 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
8 participants