diff options
| author | bors <bors@rust-lang.org> | 2022-11-13 18:13:08 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-11-13 18:13:08 +0000 |
| commit | e631891f7ad40eac3ef58ec3c2b57ecd81e40615 (patch) | |
| tree | f12e807d6a2bb7b1ad5401aec6f860ec29765399 /compiler/rustc_codegen_llvm/src | |
| parent | e4d6307c633c954971f3ca7876d4f29f3fe83614 (diff) | |
| parent | 39ff9d28724870876bd6c9d0e1d8815b12c1bdc6 (diff) | |
| download | rust-e631891f7ad40eac3ef58ec3c2b57ecd81e40615.tar.gz rust-e631891f7ad40eac3ef58ec3c2b57ecd81e40615.zip | |
Auto merge of #104370 - matthiaskrgr:rollup-c3b38sm, r=matthiaskrgr
Rollup of 5 pull requests
Successful merges:
- #103996 (Add small clarification around using pointers derived from references)
- #104315 (Improve spans with `use crate::{self}`)
- #104320 (Use `derive_const` and rm manual StructuralEq impl)
- #104357 (add is_sized method on Abi and Layout, and use it)
- #104365 (Add x tool to triagebot)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_llvm/src')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/debuginfo/utils.rs | 2 | ||||
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/type_of.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_codegen_llvm/src/debuginfo/utils.rs b/compiler/rustc_codegen_llvm/src/debuginfo/utils.rs index a40cfc8b23f..5cd0e1cb63a 100644 --- a/compiler/rustc_codegen_llvm/src/debuginfo/utils.rs +++ b/compiler/rustc_codegen_llvm/src/debuginfo/utils.rs @@ -72,7 +72,7 @@ pub(crate) fn fat_pointer_kind<'ll, 'tcx>( layout.is_unsized() ); - if !layout.is_unsized() { + if layout.is_sized() { return None; } diff --git a/compiler/rustc_codegen_llvm/src/type_of.rs b/compiler/rustc_codegen_llvm/src/type_of.rs index dc1165835e7..182adf81785 100644 --- a/compiler/rustc_codegen_llvm/src/type_of.rs +++ b/compiler/rustc_codegen_llvm/src/type_of.rs @@ -140,7 +140,7 @@ fn struct_llfields<'a, 'tcx>( prev_effective_align = effective_field_align; } let padding_used = result.len() > field_count; - if !layout.is_unsized() && field_count > 0 { + if layout.is_sized() && field_count > 0 { if offset > layout.size { bug!("layout: {:#?} stride: {:?} offset: {:?}", layout, layout.size, offset); } |
