bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

use stores of the correct size to set discriminants

Browse source
This commit is contained in:
The 8472 2024-10-13 18:01:52 +02:00
parent 97b84e40cb
commit 26d7b5da99
1 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

24
compiler/rustc_codegen_ssa/src/mir/place.rs
View file

@ -1,5 +1,6 @@
use rustc_abi::Primitive::{Int, Pointer}; use rustc_abi::Primitive::{Int, Pointer};
use rustc_abi::{Align, FieldsShape, Size, TagEncoding, VariantIdx, Variants}; use rustc_abi::{Align, BackendRepr, FieldsShape, Size, TagEncoding, VariantIdx, Variants};
use rustc_middle::mir::interpret::Scalar;
use rustc_middle::mir::tcx::PlaceTy; use rustc_middle::mir::tcx::PlaceTy;
use rustc_middle::ty::layout::{HasTyCtxt, LayoutOf, TyAndLayout}; use rustc_middle::ty::layout::{HasTyCtxt, LayoutOf, TyAndLayout};
use rustc_middle::ty::{self, Ty}; use rustc_middle::ty::{self, Ty};
@ -385,15 +386,22 @@ impl<'a, 'tcx, V: CodegenObject> PlaceRef<'tcx, V> {
if variant_index != untagged_variant { if variant_index != untagged_variant {
let niche = self.project_field(bx, tag_field); let niche = self.project_field(bx, tag_field);
let niche_llty = bx.cx().immediate_backend_type(niche.layout); let niche_llty = bx.cx().immediate_backend_type(niche.layout);
let BackendRepr::Scalar(scalar) = niche.layout.backend_repr else {
bug!("expected a scalar placeref for the niche");
};
// We are supposed to compute `niche_value.wrapping_add(niche_start)` wrapping
// around the `niche`'s type.
// The easiest way to do that is to do wrapping arithmetic on `u128` and then
// masking off any extra bits that occur because we did the arithmetic with too many bits.
let niche_value = variant_index.as_u32() - niche_variants.start().as_u32(); let niche_value = variant_index.as_u32() - niche_variants.start().as_u32();
let niche_value = (niche_value as u128).wrapping_add(niche_start); let niche_value = (niche_value as u128).wrapping_add(niche_start);
// FIXME(eddyb): check the actual primitive type here. let niche_value = niche_value & niche.layout.size.unsigned_int_max();
let niche_llval = if niche_value == 0 {
// HACK(eddyb): using `c_null` as it works on all types. let niche_llval = bx.cx().scalar_to_backend(
bx.cx().const_null(niche_llty) Scalar::from_uint(niche_value, niche.layout.size),
} else { scalar,
bx.cx().const_uint_big(niche_llty, niche_value) niche_llty,
}; );
OperandValue::Immediate(niche_llval).store(bx, niche); OperandValue::Immediate(niche_llval).store(bx, niche);
} }
} }