distinguish "no data" from "heterogeneous" in ABI #57645

nikomatsakis · 2019-01-15T22:14:02Z

Ignore zero-sized types when computing whether something is a homogeneous aggregate, except be careful of VLA.

nikomatsakis · 2019-01-15T22:14:31Z

PS, @glandium, you may want to try this build to see if it fixes your problem =)

nikomatsakis · 2019-01-15T22:29:51Z

One interesting test where the right behavior is not obvious:

#[repr(C)]
pub struct MiddleFieldPhantom {
    pub a: f32,
    pub b: f32,
    pub c: [u32; 0],
    pub d: PhantomData<u8>,
}

/// In the case where the VLA is in the middle, but the only thing
/// that comes next is phantomdata, we still consider that to be
/// `has_vla: false`. Not clear if that is correct but also not clear
/// that it is wrong.
#[rustc_layout(abi)]
pub type Test4 = MiddleFieldPhantom;
//~^ ERROR abi: Aggregate { sized: true, has_vla: false }

nikomatsakis · 2019-01-16T14:33:50Z

Tests just needed to be blessed. Hopefully ok now.

nikomatsakis · 2019-01-16T16:51:32Z

@bors try

bors · 2019-01-16T16:51:46Z

⌛ Trying commit 6beebd0d109004f208b4241229ecedf12a752971 with merge 896270e14094a65293b52bbbf9b447c557dda848...

nikomatsakis · 2019-01-16T16:52:30Z

@glandium when the try build above completes, we should produce an aarch64 artifact that you can evaluate. It can be installed using the rustup-toolchain-install-master utility.

bors · 2019-01-16T17:58:47Z

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

bors · 2019-01-16T18:40:40Z

☀️ Test successful - checks-travis
State: approved= try=True

glandium · 2019-01-17T05:41:40Z

@glandium when the try build above completes, we should produce an aarch64 artifact that you can evaluate. It can be installed using the rustup-toolchain-install-master utility.

I don't know what commit to give rust-toolchain-install-master. I tried 6beebd0d109004f208b4241229ecedf12a752971 and 896270e14094a65293b52bbbf9b447c557dda848, which is the last couple (commit, merge) linked by bors here, but it all ends up in 404s.

nikomatsakis · 2019-01-17T14:58:47Z

@glandium I think 896270e is correct; not sure why it didn't work, maybe @pietroalbini or @Mark-Simulacrum have a suggestion (they're the ones who advised me on how to do it)

pietroalbini · 2019-01-17T15:12:10Z

This command works for me:

rustup-toolchain-install-master --host aarch64-unknown-linux-gnu 896270e14094a65293b52bbbf9b447c557dda848

glandium · 2019-01-18T01:18:13Z

So it looks like bors only built aarch64-unknown-linux-gnu host rustc? I can't test those, because we don't build Firefox on those. For aarch64-pc-windows-msvc, we build on x86_64-pc-windows-msvc.

pietroalbini · 2019-01-18T15:54:08Z

We can't do try builds for windows at the moment though.

nagisa · 2019-01-18T20:10:12Z

src/librustc/ty/layout.rs

@@ -550,7 +572,7 @@ impl<'a, 'tcx> LayoutCx<'tcx, TyCtxt<'a, 'tcx, 'tcx>> {
                let abi = if count != 0 && ty.conservative_is_privately_uninhabited(tcx) {
                    Abi::Uninhabited
                } else {
-                    Abi::Aggregate { sized: true }
+                    Abi::Aggregate { sized: true, has_vla: (count == 0) }


Is a check for repr.c() not warranted here?

Ah, never mind, its an array, which is repr(C) by definition.

See #56877 (comment) about VLA-ness of 0-sized arrays.

src/librustc/ty/layout.rs

nagisa · 2019-01-18T20:23:14Z

src/librustc/ty/layout.rs

@@ -706,6 +738,13 @@ impl<'a, 'tcx> LayoutCx<'tcx, TyCtxt<'a, 'tcx, 'tcx>> {
                        };
                        align = align.max(field_align);

+                        // Track whether any field had the "VLA flag.
+                        if !any_variant_has_vla {


Is there any particular reason other than a gut feeling for short-circuiting the code inside? To me it seems like a likely no-op performance wise.

nagisa · 2019-01-18T20:25:40Z

src/librustc/ty/layout.rs

+                    if any_variant_has_vla && def.repr.c() {
+                        if let Abi::Aggregate { has_vla, .. } = &mut abi {
+                            *has_vla = true;
+                        }


Similarly a style nit, this could be written as just

if let Abi::Aggregate { has_vla, .. } = &mut abi { *has_vla |= any_variant_has_vla && def.repr.c(); }

nagisa · 2019-01-18T20:55:32Z

src/librustc_target/abi/mod.rs

+        /// a homogeneous aggregate.
+        ///
+        /// (Note that this field is always false for things that are
+        /// not `#[repr(C)]`.)


Note that this field is always false for things that are not #[repr(C)]

Seems like a difficult requirement to uphold in the future without something asserting this somewhere. I feel like the code downstream should be able to handle this field regardless of the overall ABI (i.e. interpret it semantically).

If an aggregate has a VLA within itself, it itself becomes variable-length, in which case it would make sense to just name this field as is_variable_length...

Which then brings up a question: does it make sense for a variable-length aggregate to also be sized? Well, at least the #[repr(C)] struct Foo { last: [T; 0] } would be Aggregate { sized: true, variable_length: true }, but then what really is it – a variable length aggregate or a zero-sized aggregate? Hmm...

To be fair, I’m not sure what ABI interactions arise here – the currently implemented behaviour may well be the correct one...

src/librustc_passes/layout_test.rs

nagisa · 2019-01-18T20:59:11Z

I feel like this could still use a codegen test for aarch regression, but sadly our codegen testing infrastructure does not currently allow testing assembly...

glandium · 2019-01-18T21:19:35Z

We can't do try builds for windows at the moment though.

I'm told this affects Fennec for aarch64 Android as well, and we build those on Linux. Can you do a try x86_64-pc-linux-gnu build (with aarch64 std)?

arielb1 · 2019-01-20T18:33:38Z

@nikomatsakis

I'll look at this when I'll have the time - don't know when will that be.

nikomatsakis · 2019-01-22T15:10:41Z

I found this comment by @parched somewhat persuasive -- it basically argues that we don't really have a way to represent "VLA" in Rust today (it's almost a [T] type, except that a pointer to it should not be a fat pointer), and that -- in any case -- it is basically incorrect to pass a "variable-length struct" by value, so we should err on the side of assuming that [T; 0] actually means a zero-length array and not a variable-length array. I think this implies that we could simplify this PR by basically removing the has_vla logic and just filtering out zero-sized things during the homogeneous aggregate test.

glandium · 2019-01-24T01:50:49Z

Can you do a try x86_64-pc-linux-gnu build (with aarch64 std)?

pnkfelix · 2019-01-24T14:08:40Z

@nikomatsakis wrote:

I've updated the PR to only exclude repr(rust) structs. I believe this is strictly better than status quo. It is also somewhat dissatisfying to me, but I'd really like to land something here and it seems like there is consensus on going forward with this minimal set.

can you update the PR description to reflect this change, so that the eventual bors commit will have a commit message that reflects reality?

nikomatsakis · 2019-01-24T17:38:49Z

@eddyb I believe this now implements the change you wanted in the way that you wanted it =) if you approve, I'll squash the commits.

src/librustc_target/abi/call/mod.rs

nikomatsakis · 2019-01-24T21:33:37Z

Squashed and rebased.

r? @eddyb

eddyb · 2019-01-24T22:43:30Z

r=me with description updated

Also, add a testing infrastructure and tests that lets us dump layout.

nikomatsakis · 2019-01-25T15:04:52Z

@bors r=eddyb p=1

Giving high priority because this is blocking some folks at Mozilla

bors · 2019-01-25T15:04:53Z

📌 Commit 8e4c57f has been approved by eddyb

@arielb1

…ates, r=eddyb distinguish "no data" from "heterogeneous" in ABI Ignore zero-sized types when computing whether something is a homogeneous aggregate, except be careful of VLA. cc rust-lang#56877 r? @arielb1 cc @eddyb

@ghost

Rollup of 5 pull requests Successful merges: - #56233 (Miri and miri-related code contains repetitions of `(n << amt) >> amt`) - #57645 (distinguish "no data" from "heterogeneous" in ABI) - #57734 (Fix evaluating trivial drop glue in constants) - #57886 (Add suggestion for moving type declaration before associated type bindings in generic arguments.) - #57890 (Fix wording in diagnostics page) Failed merges: r? @ghost

varkor assigned arielb1 Jan 15, 2019

nikomatsakis force-pushed the issue-56877-abi-aggregates branch from 74313f5 to 01e206d Compare January 15, 2019 22:30

This comment has been minimized.

Sign in to view

nikomatsakis force-pushed the issue-56877-abi-aggregates branch from 01e206d to a1defb3 Compare January 16, 2019 14:33

nikomatsakis force-pushed the issue-56877-abi-aggregates branch from 913d548 to 6beebd0 Compare January 16, 2019 16:50

bors added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Jan 16, 2019

nagisa reviewed Jan 18, 2019

View reviewed changes

src/librustc/ty/layout.rs Outdated Show resolved Hide resolved

nagisa reviewed Jan 18, 2019

View reviewed changes

src/librustc_passes/layout_test.rs Show resolved Hide resolved

nikomatsakis force-pushed the issue-56877-abi-aggregates branch from d0c4260 to 784a26d Compare January 23, 2019 21:25

nikomatsakis mentioned this pull request Jan 23, 2019

PhantomData fields in repr(C) structs change ABI on aarch64 #56877

Closed

nikomatsakis force-pushed the issue-56877-abi-aggregates branch from 03dc540 to 99105b6 Compare January 24, 2019 17:38

nikomatsakis changed the title ~~abi aggregates~~ ignore zero-sized data in abi aggregates Jan 24, 2019

eddyb reviewed Jan 24, 2019

View reviewed changes

src/librustc_target/abi/call/mod.rs Outdated Show resolved Hide resolved

eddyb reviewed Jan 24, 2019

View reviewed changes

src/librustc_target/abi/call/mod.rs Outdated Show resolved Hide resolved

nikomatsakis commented Jan 24, 2019

View reviewed changes

src/librustc_target/abi/call/mod.rs Outdated Show resolved Hide resolved

nikomatsakis force-pushed the issue-56877-abi-aggregates branch from 030a15c to f622ed1 Compare January 24, 2019 21:33

rust-highfive assigned eddyb and unassigned arielb1 Jan 24, 2019

nikomatsakis force-pushed the issue-56877-abi-aggregates branch from f622ed1 to 500a5ca Compare January 24, 2019 21:34

distinguish "no data" from "heterogeneous" for ABI purposes

8e4c57f

Also, add a testing infrastructure and tests that lets us dump layout.

nikomatsakis force-pushed the issue-56877-abi-aggregates branch from 500a5ca to 8e4c57f Compare January 25, 2019 15:04

nikomatsakis changed the title ~~ignore zero-sized data in abi aggregates~~ distinguish "no data" from "heterogeneous" in ABI Jan 25, 2019

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jan 25, 2019

Centril mentioned this pull request Jan 25, 2019

Rollup of 5 pull requests #57898

Merged

bors merged commit 8e4c57f into rust-lang:master Jan 26, 2019

pnkfelix mentioned this pull request Feb 15, 2019

aarch64 ABI: revisit which ZST fields should be filtered from repr(C) #58487

Open

LeSeulArtichaut mentioned this pull request May 11, 2021

#[rustc_layout(debug)] ICEs when applied to some type aliases #85103

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

distinguish "no data" from "heterogeneous" in ABI #57645

distinguish "no data" from "heterogeneous" in ABI #57645

nikomatsakis commented Jan 15, 2019 •

edited

nikomatsakis commented Jan 15, 2019

nikomatsakis commented Jan 15, 2019

This comment has been minimized.

nikomatsakis commented Jan 16, 2019

nikomatsakis commented Jan 16, 2019

bors commented Jan 16, 2019

nikomatsakis commented Jan 16, 2019

bors commented Jan 16, 2019

bors commented Jan 16, 2019

glandium commented Jan 17, 2019

nikomatsakis commented Jan 17, 2019

pietroalbini commented Jan 17, 2019

glandium commented Jan 18, 2019

pietroalbini commented Jan 18, 2019

nagisa Jan 18, 2019

nagisa Jan 18, 2019

nagisa Jan 18, 2019

nagisa Jan 18, 2019

nagisa Jan 18, 2019 •

edited

nagisa Jan 18, 2019

nagisa commented Jan 18, 2019

glandium commented Jan 18, 2019

arielb1 commented Jan 20, 2019

nikomatsakis commented Jan 22, 2019

glandium commented Jan 24, 2019

pnkfelix commented Jan 24, 2019

nikomatsakis commented Jan 24, 2019

nikomatsakis commented Jan 24, 2019

eddyb commented Jan 24, 2019

nikomatsakis commented Jan 25, 2019

bors commented Jan 25, 2019

distinguish "no data" from "heterogeneous" in ABI #57645

distinguish "no data" from "heterogeneous" in ABI #57645

Conversation

nikomatsakis commented Jan 15, 2019 • edited

nikomatsakis commented Jan 15, 2019

nikomatsakis commented Jan 15, 2019

This comment has been minimized.

nikomatsakis commented Jan 16, 2019

nikomatsakis commented Jan 16, 2019

bors commented Jan 16, 2019

nikomatsakis commented Jan 16, 2019

bors commented Jan 16, 2019

bors commented Jan 16, 2019

glandium commented Jan 17, 2019

nikomatsakis commented Jan 17, 2019

pietroalbini commented Jan 17, 2019

glandium commented Jan 18, 2019

pietroalbini commented Jan 18, 2019

nagisa Jan 18, 2019

Choose a reason for hiding this comment

nagisa Jan 18, 2019

Choose a reason for hiding this comment

nagisa Jan 18, 2019

Choose a reason for hiding this comment

nagisa Jan 18, 2019

Choose a reason for hiding this comment

nagisa Jan 18, 2019 • edited

Choose a reason for hiding this comment

nagisa Jan 18, 2019

Choose a reason for hiding this comment

nagisa commented Jan 18, 2019

glandium commented Jan 18, 2019

arielb1 commented Jan 20, 2019

nikomatsakis commented Jan 22, 2019

glandium commented Jan 24, 2019

pnkfelix commented Jan 24, 2019

nikomatsakis commented Jan 24, 2019

nikomatsakis commented Jan 24, 2019

eddyb commented Jan 24, 2019

nikomatsakis commented Jan 25, 2019

bors commented Jan 25, 2019

nikomatsakis commented Jan 15, 2019 •

edited

nagisa Jan 18, 2019 •

edited