diff options
| author | bors <bors@rust-lang.org> | 2022-07-05 23:12:34 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-07-05 23:12:34 +0000 |
| commit | f342bea9d19f14616c6559312552e6d0ee529cfd (patch) | |
| tree | ebcd7b37e2b6a58192dd7e9a9d4f6e377fa23136 /compiler/rustc_middle/src | |
| parent | 7b46aa594c4bdc507fbd904b6777ca30c37a9209 (diff) | |
| parent | 0eded16705a493d53c8b5c646e2eb4be68ba9224 (diff) | |
| download | rust-f342bea9d19f14616c6559312552e6d0ee529cfd.tar.gz rust-f342bea9d19f14616c6559312552e6d0ee529cfd.zip | |
Auto merge of #98963 - GuillaumeGomez:rollup-n030us5, r=GuillaumeGomez
Rollup of 6 pull requests Successful merges: - #95503 (bootstrap: Allow building individual crates) - #96814 (Fix repr(align) enum handling) - #98256 (Fix whitespace handling after where clause) - #98880 (Proper macOS libLLVM symlink when cross compiling) - #98944 (Edit `rustc_mir_dataflow::framework::lattice::FlatSet` docs) - #98951 (Update books) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_middle/src')
| -rw-r--r-- | compiler/rustc_middle/src/ty/layout.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/compiler/rustc_middle/src/ty/layout.rs b/compiler/rustc_middle/src/ty/layout.rs index 3b05e42a53e..e20f94b15c6 100644 --- a/compiler/rustc_middle/src/ty/layout.rs +++ b/compiler/rustc_middle/src/ty/layout.rs @@ -1418,9 +1418,9 @@ impl<'tcx> LayoutCx<'tcx, TyCtxt<'tcx>> { if layout_variants.iter().all(|v| v.abi.is_uninhabited()) { abi = Abi::Uninhabited; - } else if tag.size(dl) == size || variants.iter().all(|layout| layout.is_empty()) { - // Without latter check aligned enums with custom discriminant values - // Would result in ICE see the issue #92464 for more info + } else if tag.size(dl) == size { + // Make sure we only use scalar layout when the enum is entirely its + // own tag (i.e. it has no padding nor any non-ZST variant fields). abi = Abi::Scalar(tag); } else { // Try to use a ScalarPair for all tagged enums. |