Merge remote-tracking branch 'upstream/master' into merge_master_into_scope #6371
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original name was confusing in absence of "transition" context and could lead into thinking it enables @safe checks.
fix Issue 16625 - undeprecated switch fallthrough error
Rename 'safe' global arg to 'vsafe'
…sted - Since dlang#5500 buildPostblit/Dtor/OpAssign are run before the struct size is finalized, thereby now making structs nested that previously were not. - Not sure if the old behavior was an intended feature. If not we might want to deprecate it.
fix Issue 16627 - non-static structs with postblit/dtor fields now nested
- This reverts removing the AggregateDeclaration.setScope override (see 75b5b69) and fixes a wrong error triggered by setting _scope on a SIZEOKdone struct during deferred setScope phases (outer struct has forward references).
fix Issue 16607 - forward reference error for nested struct
refactor: use CodeBuilder in iasm.c
Fix msvc/64-bit build.
Delete dmd.exe before build in 'release' target
convert objc_glue_stubs.c to D
sed 's/\([a-zA-Z0-9]\)->/\1./' -i */*.d
Dlangify printf comments from -> to .
get broadcast to work with YMM registers
cg87.c: more conversion to CodeBuilder
- enable PIC by default on amd64 linux (no significant overhead, full PIC/PIE support) - also see dlang/installer#207
disable CircleCI on dmd-1.x branch
fix Issue 16794 - dmd not working on Ubuntu 16.10
vec.c: speed up inner loops
fix Issue 17029 - [Reg 2.072] scope variable may not be returned
cg87.c: even more CodeBuilder
- only fetch base branch (and only with --depth=1) - use '<>' null email address - mention merge hashs in commit message Alternatively could use GH's PR merge refs, but GH is fairly slow at merging them, and the PR might have been updated in the meanwhile. git fetch https://github.com/dlang/dmd.git pull/$CIRCLE_PR_NUMBER/merge --depth=1 git checkout FETCH_HEAD
- because git lacks the common history of the branches a textural merge is performed and will fail unexpectedly
CircleCI: merge PR branch into master before testing merged-on-behalf-of: Martin Nowak <code@dawg.eu>
issue 17027 - add TZCNT and LZCNT to inline assembler
Merge remote-tracking branch 'upstream/stable' into merge_stable
Fix Issue 17034 - DMD 32 bit PIC wrong code
Contributor
|
…_scope Conflicts: src/escape.d src/func.d src/globals.d src/mars.d src/mtype.d src/statementsem.d test/fail_compilation/test16193.d
MartinNowak
force-pushed
the
merge_master_into_scope
branch
from
b3c83ba to
491b7cc
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
19 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Conflicts:
src/escape.d
src/func.d
src/globals.d
src/mars.d
src/mtype.d
src/statementsem.d
test/fail_compilation/test16193.d
To already resolve the merge conflicts and for final testing of the scope branch before merging it back.