Skip to content

Commit 62418f4

Browse files
committed
intrinsics: rename min_align_of to align_of
1 parent fd50e10 commit 62418f4

35 files changed

+73
-87
lines changed

compiler/rustc_codegen_cranelift/example/mini_core.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -644,9 +644,9 @@ pub mod intrinsics {
644644
#[rustc_intrinsic]
645645
pub unsafe fn size_of_val<T: ?::Sized>(val: *const T) -> usize;
646646
#[rustc_intrinsic]
647-
pub fn min_align_of<T>() -> usize;
647+
pub fn align_of<T>() -> usize;
648648
#[rustc_intrinsic]
649-
pub unsafe fn min_align_of_val<T: ?::Sized>(val: *const T) -> usize;
649+
pub unsafe fn align_of_val<T: ?::Sized>(val: *const T) -> usize;
650650
#[rustc_intrinsic]
651651
pub unsafe fn copy<T>(src: *const T, dst: *mut T, count: usize);
652652
#[rustc_intrinsic]

compiler/rustc_codegen_cranelift/example/mini_core_hello_world.rs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -204,11 +204,8 @@ fn main() {
204204
assert_eq!(intrinsics::size_of_val(a) as u8, 16);
205205
assert_eq!(intrinsics::size_of_val(&0u32) as u8, 4);
206206

207-
assert_eq!(intrinsics::min_align_of::<u16>() as u8, 2);
208-
assert_eq!(
209-
intrinsics::min_align_of_val(&a) as u8,
210-
intrinsics::min_align_of::<&str>() as u8
211-
);
207+
assert_eq!(intrinsics::align_of::<u16>() as u8, 2);
208+
assert_eq!(intrinsics::align_of_val(&a) as u8, intrinsics::align_of::<&str>() as u8);
212209

213210
assert!(!intrinsics::needs_drop::<u8>());
214211
assert!(!intrinsics::needs_drop::<[u8]>());

compiler/rustc_codegen_cranelift/src/intrinsics/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -586,7 +586,7 @@ fn codegen_regular_intrinsic_call<'tcx>(
586586
let (size, _align) = crate::unsize::size_and_align_of(fx, layout, meta);
587587
ret.write_cvalue(fx, CValue::by_val(size, usize_layout));
588588
}
589-
sym::min_align_of_val => {
589+
sym::align_of_val => {
590590
intrinsic_args!(fx, args => (ptr); intrinsic);
591591

592592
let layout = fx.layout_of(generic_args.type_at(0));
@@ -613,7 +613,7 @@ fn codegen_regular_intrinsic_call<'tcx>(
613613
intrinsic_args!(fx, args => (vtable); intrinsic);
614614
let vtable = vtable.load_scalar(fx);
615615

616-
let align = crate::vtable::min_align_of_obj(fx, vtable);
616+
let align = crate::vtable::align_of_obj(fx, vtable);
617617
ret.write_cvalue(fx, CValue::by_val(align, usize_layout));
618618
}
619619

compiler/rustc_codegen_cranelift/src/unsize.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ pub(crate) fn size_and_align_of<'tcx>(
212212
// load size/align from vtable
213213
(
214214
crate::vtable::size_of_obj(fx, info.unwrap()),
215-
crate::vtable::min_align_of_obj(fx, info.unwrap()),
215+
crate::vtable::align_of_obj(fx, info.unwrap()),
216216
)
217217
}
218218
ty::Slice(_) | ty::Str => {

compiler/rustc_codegen_cranelift/src/vtable.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ pub(crate) fn size_of_obj(fx: &mut FunctionCx<'_, '_, '_>, vtable: Value) -> Val
3131
)
3232
}
3333

34-
pub(crate) fn min_align_of_obj(fx: &mut FunctionCx<'_, '_, '_>, vtable: Value) -> Value {
34+
pub(crate) fn align_of_obj(fx: &mut FunctionCx<'_, '_, '_>, vtable: Value) -> Value {
3535
let usize_size = fx.layout_of(fx.tcx.types.usize).size.bytes() as usize;
3636
fx.bcx.ins().load(
3737
fx.pointer_type,

compiler/rustc_codegen_gcc/example/mini_core.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -655,9 +655,9 @@ pub mod intrinsics {
655655
#[rustc_intrinsic]
656656
pub unsafe fn size_of_val<T: ?::Sized>(val: *const T) -> usize;
657657
#[rustc_intrinsic]
658-
pub fn min_align_of<T>() -> usize;
658+
pub fn align_of<T>() -> usize;
659659
#[rustc_intrinsic]
660-
pub unsafe fn min_align_of_val<T: ?::Sized>(val: *const T) -> usize;
660+
pub unsafe fn align_of_val<T: ?::Sized>(val: *const T) -> usize;
661661
#[rustc_intrinsic]
662662
pub unsafe fn copy<T>(src: *const T, dst: *mut T, count: usize);
663663
#[rustc_intrinsic]

compiler/rustc_codegen_gcc/example/mini_core_hello_world.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ fn main() {
153153
let slice = &[0, 1] as &[i32];
154154
let slice_ptr = slice as *const [i32] as *const i32;
155155

156-
let align = intrinsics::min_align_of::<*const i32>();
156+
let align = intrinsics::align_of::<*const i32>();
157157
assert_eq!(slice_ptr as usize % align, 0);
158158

159159
//return;
@@ -194,8 +194,8 @@ fn main() {
194194
assert_eq!(intrinsics::size_of_val(a) as u8, 8);
195195
assert_eq!(intrinsics::size_of_val(&0u32) as u8, 4);
196196

197-
assert_eq!(intrinsics::min_align_of::<u16>() as u8, 2);
198-
assert_eq!(intrinsics::min_align_of_val(&a) as u8, intrinsics::min_align_of::<&str>() as u8);
197+
assert_eq!(intrinsics::align_of::<u16>() as u8, 2);
198+
assert_eq!(intrinsics::align_of_val(&a) as u8, intrinsics::align_of::<&str>() as u8);
199199

200200
assert!(!intrinsics::needs_drop::<u8>());
201201
assert!(!intrinsics::needs_drop::<[u8]>());

compiler/rustc_codegen_ssa/src/mir/intrinsic.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
118118
let (llsize, _) = size_of_val::size_and_align_of_dst(bx, tp_ty, meta);
119119
llsize
120120
}
121-
sym::min_align_of_val => {
121+
sym::align_of_val => {
122122
let tp_ty = fn_args.type_at(0);
123123
let (_, meta) = args[0].val.pointer_parts();
124124
let (_, llalign) = size_of_val::size_and_align_of_dst(bx, tp_ty, meta);

compiler/rustc_const_eval/src/interpret/intrinsics.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ impl<'tcx, M: Machine<'tcx>> InterpCx<'tcx, M> {
120120
self.copy_op(&val, dest)?;
121121
}
122122

123-
sym::min_align_of_val | sym::size_of_val => {
123+
sym::align_of_val | sym::size_of_val => {
124124
// Avoid `deref_pointer` -- this is not a deref, the ptr does not have to be
125125
// dereferenceable!
126126
let place = self.ref_to_mplace(&self.read_immediate(&args[0])?)?;
@@ -129,7 +129,7 @@ impl<'tcx, M: Machine<'tcx>> InterpCx<'tcx, M> {
129129
.ok_or_else(|| err_unsup_format!("`extern type` does not have known layout"))?;
130130

131131
let result = match intrinsic_name {
132-
sym::min_align_of_val => align.bytes(),
132+
sym::align_of_val => align.bytes(),
133133
sym::size_of_val => size.bytes(),
134134
_ => bug!(),
135135
};

compiler/rustc_hir_analysis/src/check/intrinsic.rs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ fn intrinsic_operation_unsafety(tcx: TyCtxt<'_>, intrinsic_id: LocalDefId) -> hi
7171
| sym::box_new
7272
| sym::breakpoint
7373
| sym::size_of
74-
| sym::min_align_of
74+
| sym::align_of
7575
| sym::needs_drop
7676
| sym::caller_location
7777
| sym::add_with_overflow
@@ -200,10 +200,8 @@ pub(crate) fn check_intrinsic_type(
200200
sym::abort => (0, 0, vec![], tcx.types.never),
201201
sym::unreachable => (0, 0, vec![], tcx.types.never),
202202
sym::breakpoint => (0, 0, vec![], tcx.types.unit),
203-
sym::size_of | sym::pref_align_of | sym::min_align_of | sym::variant_count => {
204-
(1, 0, vec![], tcx.types.usize)
205-
}
206-
sym::size_of_val | sym::min_align_of_val => {
203+
sym::size_of | sym::align_of | sym::variant_count => (1, 0, vec![], tcx.types.usize),
204+
sym::size_of_val | sym::align_of_val => {
207205
(1, 0, vec![Ty::new_imm_ptr(tcx, param(0))], tcx.types.usize)
208206
}
209207
sym::rustc_peek => (1, 0, vec![param(0)], param(0)),

0 commit comments

Comments
 (0)