Skip to content

Commit c7d43c3

Browse files
committed
Sync from rust 13a5289
2 parents b4e46de + e2acda7 commit c7d43c3

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

src/common.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ fn clif_type_from_ty<'tcx>(tcx: TyCtxt<'tcx>, ty: Ty<'tcx>) -> Option<types::Typ
6969
FloatTy::F64 => types::F64,
7070
FloatTy::F128 => unimplemented!("f16_f128"),
7171
},
72-
ty::FnPtr(_) => pointer_ty(tcx),
72+
ty::FnPtr(..) => pointer_ty(tcx),
7373
ty::RawPtr(pointee_ty, _) | ty::Ref(_, pointee_ty, _) => {
7474
if has_ptr_meta(tcx, *pointee_ty) {
7575
return None;

src/intrinsics/mod.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -725,7 +725,8 @@ fn codegen_regular_intrinsic_call<'tcx>(
725725

726726
// Cranelift treats stores as volatile by default
727727
// FIXME correctly handle unaligned_volatile_store
728-
// FIXME actually do nontemporal stores if requested
728+
// FIXME actually do nontemporal stores if requested (but do not just emit MOVNT on x86;
729+
// see the LLVM backend for details)
729730
let dest = CPlace::for_ptr(Pointer::new(ptr), val.layout());
730731
dest.write_cvalue(fx, val);
731732
}

src/value_and_place.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -874,7 +874,7 @@ pub(crate) fn assert_assignable<'tcx>(
874874
(ty::Ref(_, a, _), ty::RawPtr(b, _)) | (ty::RawPtr(a, _), ty::Ref(_, b, _)) => {
875875
assert_assignable(fx, *a, *b, limit - 1);
876876
}
877-
(ty::FnPtr(_), ty::FnPtr(_)) => {
877+
(ty::FnPtr(..), ty::FnPtr(..)) => {
878878
let from_sig = fx.tcx.normalize_erasing_late_bound_regions(
879879
ParamEnv::reveal_all(),
880880
from_ty.fn_sig(fx.tcx),

0 commit comments

Comments
 (0)