Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions compiler/rustc_middle/src/ty/context.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1330,8 +1330,8 @@ impl<'tcx> TyCtxt<'tcx> {
caller: DefId,
) -> Option<ty::Binder<'tcx, ty::FnSig<'tcx>>> {
let fun_features = &self.codegen_fn_attrs(fun_def).target_features;
let callee_features = &self.codegen_fn_attrs(caller).target_features;
if self.is_target_feature_call_safe(&fun_features, &callee_features) {
let caller_features = &self.body_codegen_attrs(caller).target_features;
if self.is_target_feature_call_safe(&fun_features, &caller_features) {
return Some(fun_sig.map_bound(|sig| ty::FnSig { safety: hir::Safety::Safe, ..sig }));
}
None
Expand Down
33 changes: 33 additions & 0 deletions tests/ui/target-feature/const-target-feature-fn-ptr-coercion.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
//@ only-x86_64
//@ check-pass
//
// Regression test for <https://github.com/rust-lang/rust/issues/152340>.

#![allow(dead_code)]

#[target_feature(enable = "sse2")]
const fn foo() {}

// DefKind::Const
const _: () = unsafe {
let _: unsafe fn() = foo;
};

// DefKind::AssocConst
struct S;
impl S {
const C: () = unsafe {
let _: unsafe fn() = foo;
};
}

// DefKind::InlineConst
fn bar() {
let _ = const {
unsafe {
let _: unsafe fn() = foo;
}
};
}

fn main() {}
Loading