rustc_target: separate out an individual alignment quantity type from Align. by eddyb · Pull Request #54071 · rust-lang/rust

eddyb · 2018-09-08T23:16:05Z

Before this PR, rustc_target::abi::Align combined "power-of-two alignment quantity" semantics, with a distinction between ABI (required) and preferred alignment (by having two quantities).

After this PR, Align is only one such quantity, and a new AbiAndPrefAlign type is introduced to hold the pair of ABI and preferred Align quantities.

Align is used everywhere one quantity is necessary/sufficient, simplifying some of the code in codegen/miri, while AbiAndPrefAlign only in layout computation (to propagate preferred alignment).

r? @oli-obk cc @nagisa @RalfJung @nikomatsakis

bors · 2018-09-09T11:27:41Z

☔ The latest upstream changes (presumably #53998) made this pull request unmergeable. Please resolve the merge conflicts.

XAMPPRocky · 2018-09-26T15:13:12Z

Triage; @eddyb This PR needs to be rebased.

TimNN · 2018-10-16T17:29:55Z

Ping from triage @eddyb: It looks like this PR is ready to be merged except for a rebase.

TimNN · 2018-10-23T17:14:19Z

Ping from triage @eddyb: We haven't heard from you in a while about this PR, so I'm closing this as per our triage guidelines. Thanks for your contribution and please feel free to re-open in the future.

eddyb · 2018-11-22T03:08:33Z

@nagisa @oli-obk I've rebased and renamed Aligns to AbiAndPrefAlign.

oli-obk · 2018-11-22T10:05:24Z

@bors r+

bors · 2018-11-22T10:05:25Z

📌 Commit 5b4747d has been approved by oli-obk

bors · 2018-11-22T18:59:39Z

⌛ Testing commit 5b4747d with merge d75e9c6a2e2f85498c4092d61ea763c813997bb6...

emilyalbini · 2018-11-22T20:29:46Z

@bors retry

Yielding priority to the beta-accepted stuff.

bors · 2018-11-22T23:25:33Z

⌛ Testing commit 5b4747d with merge c72ccd655ce4979dd1551afe11aa4335c2e21298...

emilyalbini · 2018-11-22T23:40:12Z

@bors retry

Yielding priority to the beta rollup.

bors · 2018-11-23T01:02:31Z

⌛ Testing commit 5b4747d with merge 6a2d1b4...

@oli-obk

rustc_target: separate out an individual alignment quantity type from Align. Before this PR, `rustc_target::abi::Align` combined "power-of-two alignment quantity" semantics, with a distinction between ABI (required) and preferred alignment (by having two quantities). After this PR, `Align` is only *one* such quantity, and a new `AbiAndPrefAlign` type is introduced to hold the pair of ABI and preferred `Align` quantities. `Align` is used everywhere one quantity is necessary/sufficient, simplifying some of the code in codegen/miri, while `AbiAndPrefAlign` only in layout computation (to propagate preferred alignment). r? @oli-obk cc @nagisa @RalfJung @nikomatsakis

bors · 2018-11-23T03:58:36Z

☀️ Test successful - status-appveyor, status-travis
Approved by: oli-obk
Pushing 6a2d1b4 to master...

rust-highfive · 2018-11-23T04:00:09Z

📣 Toolstate changed by #54071!

Tested on commit 6a2d1b4.
Direct link to PR: #54071

💔 clippy-driver on windows: test-pass → build-fail (cc @Manishearth @llogiq @mcarton @oli-obk, @rust-lang/infra).
💔 clippy-driver on linux: test-pass → build-fail (cc @Manishearth @llogiq @mcarton @oli-obk, @rust-lang/infra).
💔 rls on windows: test-fail → build-fail (cc @nrc @Xanewok, @rust-lang/infra).
💔 rls on linux: test-fail → build-fail (cc @nrc @Xanewok, @rust-lang/infra).

@Manishearth

Tested on commit rust-lang/rust@6a2d1b4. Direct link to PR: <rust-lang/rust#54071> 💔 clippy-driver on windows: test-pass → build-fail (cc @Manishearth @llogiq @mcarton @oli-obk, @rust-lang/infra). 💔 clippy-driver on linux: test-pass → build-fail (cc @Manishearth @llogiq @mcarton @oli-obk, @rust-lang/infra). 💔 rls on windows: test-fail → build-fail (cc @nrc @Xanewok, @rust-lang/infra). 💔 rls on linux: test-fail → build-fail (cc @nrc @Xanewok, @rust-lang/infra).

rustup rust-lang/rust#54071

Changes: ```` rustup rust-lang#54071 dependencies: update pulldown-cmark from 0.1 to 0.2 s/file_map/source_map ````

@oli-obk

submodules: update clippy from 2f6881c to 754b4c0 Changes: ```` rustup #54071 dependencies: update pulldown-cmark from 0.1 to 0.2 s/file_map/source_map ```` r? @oli-obk

crlf0710 · 2020-03-29T09:52:39Z

@rustbot modify labels to -S-inactive-closed

Changes: ```` rustup rust-lang/rust#54071 dependencies: update pulldown-cmark from 0.1 to 0.2 s/file_map/source_map ````

rust-highfive assigned oli-obk Sep 8, 2018

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 8, 2018

eddyb force-pushed the alignsssss branch from bf3d0fb to bcc555cCompare September 8, 2018 23:23

nagisa reviewed Sep 9, 2018
View reviewed changes

Comment threadsrc/librustc_codegen_llvm/intrinsic.rs Outdated

nagisa reviewed Sep 9, 2018
View reviewed changes

Comment threadsrc/librustc_target/abi/mod.rs Outdated

oli-obk approved these changes Sep 10, 2018
View reviewed changes

XAMPPRocky added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Sep 26, 2018

TimNN closed this Oct 23, 2018

TimNN added S-inactive Status: Inactive and waiting on the author. This is often applied to closed PRs. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Oct 23, 2018

eddyb reopened this Nov 21, 2018

eddyb added 3 commits November 22, 2018 04:12

rustc_target: rename abi::Align to AbiAndPrefAlign.
d56e892

rustc_target: separate out an individual Align from AbiAndPrefAlign.
3ce8d44

rustc_target: avoid using AbiAndPrefAlign where possible.
5b4747d

eddyb force-pushed the alignsssss branch from bcc555c to 5b4747dCompare November 22, 2018 03:02

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Nov 22, 2018

bors merged commit 5b4747d into rust-lang:masterNov 23, 2018

bors mentioned this pull request Nov 23, 2018
miri: Memory data revived, Hooks for stack frame push/pop #56094
Merged

eddyb deleted the alignsssss branch November 23, 2018 05:35

matthiaskrgr added a commit to matthiaskrgr/rust-clippy that referenced this pull request Nov 23, 2018
rustuprust-lang/rust#54071
311c8e2

phansch added a commit to rust-lang/rust-clippy that referenced this pull request Nov 23, 2018
Merge pull request#3452from matthiaskrgr/rustup
754b4c0
rustup rust-lang/rust#54071

matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Nov 23, 2018
submodules: update clippy from2f6881cto754b4c0
2598a7a
Changes: ```` rustup rust-lang#54071 dependencies: update pulldown-cmark from 0.1 to 0.2 s/file_map/source_map ````

rustbot removed the S-inactive Status: Inactive and waiting on the author. This is often applied to closed PRs. label Mar 29, 2020

flip1995 pushed a commit to flip1995/rust-clippy that referenced this pull request May 5, 2020
submodules: update clippy from2f6881cto754b4c0
5afee64
Changes: ```` rustup rust-lang/rust#54071 dependencies: update pulldown-cmark from 0.1 to 0.2 s/file_map/source_map ````

Uh oh!

Uh oh!

Conversation

eddyb commented Sep 8, 2018• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

bors commented Sep 9, 2018

Uh oh!

XAMPPRocky commented Sep 26, 2018

Uh oh!

TimNN commented Oct 16, 2018

Uh oh!

TimNN commented Oct 23, 2018

Uh oh!

eddyb commented Nov 22, 2018

Uh oh!

oli-obk commented Nov 22, 2018

Uh oh!

bors commented Nov 22, 2018

Uh oh!

bors commented Nov 22, 2018

Uh oh!

emilyalbini commented Nov 22, 2018

Uh oh!

bors commented Nov 22, 2018

Uh oh!

emilyalbini commented Nov 22, 2018

Uh oh!

bors commented Nov 23, 2018

Uh oh!

bors commented Nov 23, 2018

Uh oh!

rust-highfive commented Nov 23, 2018

Uh oh!

crlf0710 commented Mar 29, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants

eddyb commented Sep 8, 2018•
edited
Loading