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

Sync from rust 13a52890dd

Browse Source
This commit is contained in:
bjorn3 2024-08-15 17:46:33 +00:00
commit c7d43c333a
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common.rs
View File

@ -69,7 +69,7 @@ fn clif_type_from_ty<'tcx>(tcx: TyCtxt<'tcx>, ty: Ty<'tcx>) -> Option<types::Typ
FloatTy::F64 => types::F64, FloatTy::F64 => types::F64,
FloatTy::F128 => unimplemented!("f16_f128"), FloatTy::F128 => unimplemented!("f16_f128"),
}, },
ty::FnPtr(_) => pointer_ty(tcx), ty::FnPtr(..) => pointer_ty(tcx),
ty::RawPtr(pointee_ty, _) | ty::Ref(_, pointee_ty, _) => { ty::RawPtr(pointee_ty, _) | ty::Ref(_, pointee_ty, _) => {
if has_ptr_meta(tcx, *pointee_ty) { if has_ptr_meta(tcx, *pointee_ty) {
return None; return None;

3
src/intrinsics/mod.rs
View File

@ -725,7 +725,8 @@ fn codegen_regular_intrinsic_call<'tcx>(
// Cranelift treats stores as volatile by default // Cranelift treats stores as volatile by default
// FIXME correctly handle unaligned_volatile_store // FIXME correctly handle unaligned_volatile_store
// FIXME actually do nontemporal stores if requested // FIXME actually do nontemporal stores if requested (but do not just emit MOVNT on x86;
// see the LLVM backend for details)
let dest = CPlace::for_ptr(Pointer::new(ptr), val.layout()); let dest = CPlace::for_ptr(Pointer::new(ptr), val.layout());
dest.write_cvalue(fx, val); dest.write_cvalue(fx, val);
} }

2
src/value_and_place.rs
View File

@ -874,7 +874,7 @@ pub(crate) fn assert_assignable<'tcx>(
(ty::Ref(_, a, _), ty::RawPtr(b, _)) | (ty::RawPtr(a, _), ty::Ref(_, b, _)) => { (ty::Ref(_, a, _), ty::RawPtr(b, _)) | (ty::RawPtr(a, _), ty::Ref(_, b, _)) => {
assert_assignable(fx, *a, *b, limit - 1); assert_assignable(fx, *a, *b, limit - 1);
} }
(ty::FnPtr(_), ty::FnPtr(_)) => { (ty::FnPtr(..), ty::FnPtr(..)) => {
let from_sig = fx.tcx.normalize_erasing_late_bound_regions( let from_sig = fx.tcx.normalize_erasing_late_bound_regions(
ParamEnv::reveal_all(), ParamEnv::reveal_all(),
from_ty.fn_sig(fx.tcx), from_ty.fn_sig(fx.tcx),