diff options
| author | bors <bors@rust-lang.org> | 2023-12-13 08:33:05 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-12-13 08:33:05 +0000 |
| commit | 2fdd9eda0ce4fa0ecbf3099783f4f505235ceb44 (patch) | |
| tree | 7b71f6689b6d293b08c6d48b0fb834f0da1f1dc6 /compiler/rustc_const_eval/src/interpret | |
| parent | f651b436ce70a6f89ec1636fbedb128a473d809b (diff) | |
| parent | f813ccd7840e7aee205d39be06166e5cbdaf54e3 (diff) | |
| download | rust-2fdd9eda0ce4fa0ecbf3099783f4f505235ceb44.tar.gz rust-2fdd9eda0ce4fa0ecbf3099783f4f505235ceb44.zip | |
Auto merge of #118534 - RalfJung:extern-type-size-of-val, r=WaffleLapkin
codegen: panic when trying to compute size/align of extern type The alignment is also computed when accessing a field of extern type at non-zero offset, so we also panic in that case. Previously `size_of_val` worked because the code path there assumed that "thin pointer" means "sized". But that's not true any more with extern types. The returned size and align are just blatantly wrong, so it seems better to panic than returning wrong results. We use a non-unwinding panic since code probably does not expect size_of_val to panic.
Diffstat (limited to 'compiler/rustc_const_eval/src/interpret')
| -rw-r--r-- | compiler/rustc_const_eval/src/interpret/projection.rs | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/compiler/rustc_const_eval/src/interpret/projection.rs b/compiler/rustc_const_eval/src/interpret/projection.rs index 4d9e296d544..0f3b6b25c61 100644 --- a/compiler/rustc_const_eval/src/interpret/projection.rs +++ b/compiler/rustc_const_eval/src/interpret/projection.rs @@ -174,12 +174,15 @@ where }; (base_meta, offset.align_to(align)) } - None => { - // For unsized types with an extern type tail we perform no adjustments. - // NOTE: keep this in sync with `PlaceRef::project_field` in the codegen backend. - assert!(matches!(base_meta, MemPlaceMeta::None)); + None if offset == Size::ZERO => { + // If the offset is 0, then rounding it up to alignment wouldn't change anything, + // so we can do this even for types where we cannot determine the alignment. (base_meta, offset) } + None => { + // We don't know the alignment of this field, so we cannot adjust. + throw_unsup_format!("`extern type` does not have a known offset") + } } } else { // base_meta could be present; we might be accessing a sized field of an unsized |
