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

Cherrypick DMD PR #6582. #2021

Merged
merged 2 commits into from
Mar 4, 2017
Merged

Conversation

JohanEngelen
Copy link
Member

@kinke
Copy link
Member

kinke commented Mar 3, 2017

Please wait before merging this, I asked Iain for more details upstream (dlang/dmd#6582).

@JohanEngelen JohanEngelen changed the title Fastforward DMD PR #6582. [WIP] Fastforward DMD PR #6582. Mar 3, 2017
@dnadlinger
Copy link
Member

Not important, but: "Fast-forward"? Do you mean "cherry-pick"?

@JohanEngelen JohanEngelen changed the title [WIP] Fastforward DMD PR #6582. [WIP] Cherrypick DMD PR #6582. Mar 3, 2017
@kinke
Copy link
Member

kinke commented Mar 3, 2017

Looks like I messed up something when merging the front-end - we have 2 Target::alignsize() implementations (ddmd/target.d and gen/target.cpp), and no linker complains. :(

The target.d diff is just the !IN_LLVM block. ;)

@dnadlinger
Copy link
Member

Isn't there a "header-only" LDC version in ddmd/target.d?

@JohanEngelen
Copy link
Member Author

I thought to fully apply the diff, even if we don't use some code of it. But perhaps you prefer to not artificially add to the diff with the "based-upon dlang version"?

@dnadlinger
Copy link
Member

@JohanEngelen: Agreed – I was just responding to @kinke's concerns about duplication.

@JohanEngelen
Copy link
Member Author

Fixed.

@JohanEngelen JohanEngelen changed the title [WIP] Cherrypick DMD PR #6582. Cherrypick DMD PR #6582. Mar 3, 2017
Fix dlang Issue 17237 - Wrong alignment for 256-bit vectors.
@dnadlinger
Copy link
Member

Huh, why did you change away from using the full DMD diff? And could you please add the DMD commit hash in the commit description? It's less ambiguous/reliant on GitHub's online data (e.g. when working on a plane).

@dnadlinger
Copy link
Member

(Feel free to merge then.)

@JohanEngelen
Copy link
Member Author

Ah lol. Confusion :)
I thought you wanted not the full diff. I have no preference, let me know. I'll add the git commit hash too then.

@dnadlinger
Copy link
Member

I was agreeing with you, ie. keep the full diff. Confusion indeed.

@kinke kinke merged commit b159de0 into ldc-developers:master Mar 4, 2017
@JohanEngelen JohanEngelen deleted the alignment branch March 5, 2017 15:33
@JohanEngelen JohanEngelen added this to the 1.2.0 milestone Mar 5, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants