bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Allow #[target_feature] on main and start for WASM

Browse source
This commit is contained in:
Léo Lanteri Thauvin 2023-03-10 13:27:13 +01:00
parent 963305bda8
commit 29b1789a75
2 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
compiler/rustc_codegen_ssa/src/codegen_attrs.rs
View file

@ -242,6 +242,9 @@ fn codegen_fn_attrs(tcx: TyCtxt<'_>, did: DefId) -> CodegenFnAttrs {
// Note that this is also allowed if `actually_rustdoc` so // Note that this is also allowed if `actually_rustdoc` so
// if a target is documenting some wasm-specific code then // if a target is documenting some wasm-specific code then
// it's not spuriously denied. // it's not spuriously denied.
//
// This exception needs to be kept in sync with allowing
// `#[target_feature]` on `main` and `start`.
} else if !tcx.features().target_feature_11 { } else if !tcx.features().target_feature_11 {
let mut err = feature_err( let mut err = feature_err(
&tcx.sess.parse_sess, &tcx.sess.parse_sess,

13
compiler/rustc_hir_analysis/src/lib.rs
View file

@ -283,7 +283,11 @@ fn check_main_fn_ty(tcx: TyCtxt<'_>, main_def_id: DefId) {
error = true; error = true;
} }
if !tcx.codegen_fn_attrs(main_def_id).target_features.is_empty() { if !tcx.codegen_fn_attrs(main_def_id).target_features.is_empty()
// Calling functions with `#[target_feature]` is not unsafe on WASM, see #84988
&& !tcx.sess.target.is_like_wasm
&& !tcx.sess.opts.actually_rustdoc
{
tcx.sess.emit_err(errors::TargetFeatureOnMain { main: main_span }); tcx.sess.emit_err(errors::TargetFeatureOnMain { main: main_span });
error = true; error = true;
} }
@ -378,7 +382,12 @@ fn check_start_fn_ty(tcx: TyCtxt<'_>, start_def_id: DefId) {
}); });
error = true; error = true;
} }
if attr.has_name(sym::target_feature) { if attr.has_name(sym::target_feature)
// Calling functions with `#[target_feature]` is
// not unsafe on WASM, see #84988
&& !tcx.sess.target.is_like_wasm
&& !tcx.sess.opts.actually_rustdoc
{
tcx.sess.emit_err(errors::StartTargetFeature { tcx.sess.emit_err(errors::StartTargetFeature {
span: attr.span, span: attr.span,
start: start_span, start: start_span,