bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Use WrappingRange::full instead of hand-rolling it

Browse source
This commit is contained in:
Oli Scherer 2022-04-05 13:13:21 +00:00
parent 09b291f0b2
commit d57b755909
3 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/rustc_codegen_gcc/src/consts.rs
View file

@ -328,7 +328,7 @@ pub fn const_alloc_to_gcc<'gcc, 'tcx>(cx: &CodegenCx<'gcc, 'tcx>, alloc: ConstAl
interpret::Pointer::new(alloc_id, Size::from_bytes(ptr_offset)), interpret::Pointer::new(alloc_id, Size::from_bytes(ptr_offset)),
&cx.tcx, &cx.tcx,
), ),
abi::Scalar::Initialized { value: Primitive::Pointer, valid_range: WrappingRange { start: 0, end: !0 } }, abi::Scalar::Initialized { value: Primitive::Pointer, valid_range: WrappingRange::full(dl.pointer_size) },
cx.type_i8p(), cx.type_i8p(),
)); ));
next_offset = offset + pointer_size; next_offset = offset + pointer_size;

2
compiler/rustc_codegen_llvm/src/consts.rs
View file

@ -111,7 +111,7 @@ pub fn const_alloc_to_llvm<'ll>(cx: &CodegenCx<'ll, '_>, alloc: ConstAllocation<
), ),
Scalar::Initialized { Scalar::Initialized {
value: Primitive::Pointer, value: Primitive::Pointer,
valid_range: WrappingRange { start: 0, end: !0 }, valid_range: WrappingRange::full(dl.pointer_size),
}, },
cx.type_i8p_ext(address_space), cx.type_i8p_ext(address_space),
)); ));

5
compiler/rustc_middle/src/ty/layout.rs
View file

@ -567,10 +567,7 @@ impl<'tcx> LayoutCx<'tcx, TyCtxt<'tcx>> {
let scalar_unit = |value: Primitive| { let scalar_unit = |value: Primitive| {
let size = value.size(dl); let size = value.size(dl);
assert!(size.bits() <= 128); assert!(size.bits() <= 128);
Scalar::Initialized { Scalar::Initialized { value, valid_range: WrappingRange::full(size) }
value,
valid_range: WrappingRange { start: 0, end: size.unsigned_int_max() },
}
}; };
let scalar = let scalar =
|value: Primitive| tcx.intern_layout(LayoutS::scalar(self, scalar_unit(value))); |value: Primitive| tcx.intern_layout(LayoutS::scalar(self, scalar_unit(value)));