mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Lower transmutes from int to pointer type as gep on null

Browse Source
This commit is contained in:
Ben Kimock 2024-02-18 19:42:27 -05:00
parent 8401645716
commit 2eb9c6d49e
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compiler/rustc_codegen_ssa/src/mir/rvalue.rs
View File

@ -306,11 +306,11 @@ fn transmute_immediate(
bx.bitcast(imm, to_backend_ty) bx.bitcast(imm, to_backend_ty)
} }
(Pointer(..), Pointer(..)) => bx.pointercast(imm, to_backend_ty), (Pointer(..), Pointer(..)) => bx.pointercast(imm, to_backend_ty),
(Int(..), Pointer(..)) => bx.inttoptr(imm, to_backend_ty), (Int(..), Pointer(..)) => bx.ptradd(bx.const_null(bx.type_ptr()), imm),
(Pointer(..), Int(..)) => bx.ptrtoint(imm, to_backend_ty), (Pointer(..), Int(..)) => bx.ptrtoint(imm, to_backend_ty),
(F16 | F32 | F64 | F128, Pointer(..)) => { (F16 | F32 | F64 | F128, Pointer(..)) => {
let int_imm = bx.bitcast(imm, bx.cx().type_isize()); let int_imm = bx.bitcast(imm, bx.cx().type_isize());
bx.inttoptr(int_imm, to_backend_ty) bx.ptradd(bx.const_null(bx.type_ptr()), int_imm)
} }
(Pointer(..), F16 | F32 | F64 | F128) => { (Pointer(..), F16 | F32 | F64 | F128) => {
let int_imm = bx.ptrtoint(imm, bx.cx().type_isize()); let int_imm = bx.ptrtoint(imm, bx.cx().type_isize());

4
tests/codegen/intrinsics/transmute.rs
View File

@ -296,7 +296,7 @@ pub unsafe fn check_pair_with_bool(x: (u8, bool)) -> (bool, i8) {
pub unsafe fn check_float_to_pointer(x: f64) -> *const () { pub unsafe fn check_float_to_pointer(x: f64) -> *const () {
// CHECK-NOT: alloca // CHECK-NOT: alloca
// CHECK: %0 = bitcast double %x to i64 // CHECK: %0 = bitcast double %x to i64
// CHECK: %_0 = inttoptr i64 %0 to ptr // CHECK: %_0 = getelementptr i8, ptr null, i64 %0
// CHECK: ret ptr %_0 // CHECK: ret ptr %_0
transmute(x) transmute(x)
} }
@ -371,7 +371,7 @@ pub unsafe fn check_issue_110005(x: (usize, bool)) -> Option<Box<[u8]>> {
// CHECK-LABEL: @check_pair_to_dst_ref( // CHECK-LABEL: @check_pair_to_dst_ref(
#[no_mangle] #[no_mangle]
pub unsafe fn check_pair_to_dst_ref<'a>(x: (usize, usize)) -> &'a [u8] { pub unsafe fn check_pair_to_dst_ref<'a>(x: (usize, usize)) -> &'a [u8] {
// CHECK: %_0.0 = inttoptr i64 %x.0 to ptr // CHECK: %_0.0 = getelementptr i8, ptr null, i64 %x.0
// CHECK: %0 = insertvalue { ptr, i64 } poison, ptr %_0.0, 0 // CHECK: %0 = insertvalue { ptr, i64 } poison, ptr %_0.0, 0
// CHECK: %1 = insertvalue { ptr, i64 } %0, i64 %x.1, 1 // CHECK: %1 = insertvalue { ptr, i64 } %0, i64 %x.1, 1
// CHECK: ret { ptr, i64 } %1 // CHECK: ret { ptr, i64 } %1

2
tests/codegen/transmute-scalar.rs
View File

@ -49,7 +49,7 @@ pub fn ptr_to_int(p: *mut u16) -> usize {
} }
// CHECK: define{{.*}}ptr @int_to_ptr([[USIZE]] %i) // CHECK: define{{.*}}ptr @int_to_ptr([[USIZE]] %i)
// CHECK: %_0 = inttoptr [[USIZE]] %i to ptr // CHECK: %_0 = getelementptr i8, ptr null, [[USIZE]] %i
// CHECK-NEXT: ret ptr %_0 // CHECK-NEXT: ret ptr %_0
#[no_mangle] #[no_mangle]
pub fn int_to_ptr(i: usize) -> *mut u16 { pub fn int_to_ptr(i: usize) -> *mut u16 {

6
tests/ui/abi/foreign/foreign-call-no-runtime.rs
View File

@ -40,21 +40,21 @@ pub fn main() {
extern "C" fn callback_isize(data: libc::uintptr_t) { extern "C" fn callback_isize(data: libc::uintptr_t) {
unsafe { unsafe {
let data: *const isize = mem::transmute(data); let data = data as *const isize;
assert_eq!(*data, 100); assert_eq!(*data, 100);
} }
} }
extern "C" fn callback_i64(data: libc::uintptr_t) { extern "C" fn callback_i64(data: libc::uintptr_t) {
unsafe { unsafe {
let data: *const i64 = mem::transmute(data); let data = data as *const i64;
assert_eq!(*data, 100); assert_eq!(*data, 100);
} }
} }
extern "C" fn callback_i32(data: libc::uintptr_t) { extern "C" fn callback_i32(data: libc::uintptr_t) {
unsafe { unsafe {
let data: *const i32 = mem::transmute(data); let data = data as *const i32;
assert_eq!(*data, 100); assert_eq!(*data, 100);
} }
} }