warn when using an unstable feature with -Ctarget-feature

This commit is contained in:
Ralf Jung 2023-11-05 18:06:19 +01:00
parent 992943dbae
commit b85c6835d0
7 changed files with 64 additions and 23 deletions

View File

@ -76,8 +76,8 @@ codegen_llvm_target_machine = could not create LLVM TargetMachine for triple: {$
codegen_llvm_target_machine_with_llvm_err = could not create LLVM TargetMachine for triple: {$triple}: {$llvm_err} codegen_llvm_target_machine_with_llvm_err = could not create LLVM TargetMachine for triple: {$triple}: {$llvm_err}
codegen_llvm_unknown_ctarget_feature = codegen_llvm_unknown_ctarget_feature =
unknown feature specified for `-Ctarget-feature`: `{$feature}` unknown and unstable feature specified for `-Ctarget-feature`: `{$feature}`
.note = it is still passed through to the codegen backend .note = it is still passed through to the codegen backend, but use of this feature might be unsound and the behavior of this feature can change in the future
.possible_feature = you might have meant: `{$rust_feature}` .possible_feature = you might have meant: `{$rust_feature}`
.consider_filing_feature_request = consider filing a feature request .consider_filing_feature_request = consider filing a feature request
@ -87,6 +87,10 @@ codegen_llvm_unknown_ctarget_feature_prefix =
codegen_llvm_unknown_debuginfo_compression = unknown debuginfo compression algorithm {$algorithm} - will fall back to uncompressed debuginfo codegen_llvm_unknown_debuginfo_compression = unknown debuginfo compression algorithm {$algorithm} - will fall back to uncompressed debuginfo
codegen_llvm_unstable_ctarget_feature =
unstable feature specified for `-Ctarget-feature`: `{$feature}`
.note = this feature is not stably supported; its behavior can change in the future
codegen_llvm_write_bytecode = failed to write bytecode to {$path}: {$err} codegen_llvm_write_bytecode = failed to write bytecode to {$path}: {$err}
codegen_llvm_write_ir = failed to write LLVM IR to {$path} codegen_llvm_write_ir = failed to write LLVM IR to {$path}

View File

@ -26,6 +26,13 @@ pub(crate) struct UnknownCTargetFeature<'a> {
pub rust_feature: PossibleFeature<'a>, pub rust_feature: PossibleFeature<'a>,
} }
#[derive(Diagnostic)]
#[diag(codegen_llvm_unstable_ctarget_feature)]
#[note]
pub(crate) struct UnstableCTargetFeature<'a> {
pub feature: &'a str,
}
#[derive(Subdiagnostic)] #[derive(Subdiagnostic)]
pub(crate) enum PossibleFeature<'a> { pub(crate) enum PossibleFeature<'a> {
#[help(codegen_llvm_possible_feature)] #[help(codegen_llvm_possible_feature)]

View File

@ -1,7 +1,7 @@
use crate::back::write::create_informational_target_machine; use crate::back::write::create_informational_target_machine;
use crate::errors::{ use crate::errors::{
PossibleFeature, TargetFeatureDisableOrEnable, UnknownCTargetFeature, PossibleFeature, TargetFeatureDisableOrEnable, UnknownCTargetFeature,
UnknownCTargetFeaturePrefix, UnknownCTargetFeaturePrefix, UnstableCTargetFeature,
}; };
use crate::llvm; use crate::llvm;
use libc::c_int; use libc::c_int;
@ -531,25 +531,34 @@ pub(crate) fn global_llvm_features(sess: &Session, diagnostics: bool) -> Vec<Str
}; };
let feature = backend_feature_name(s)?; let feature = backend_feature_name(s)?;
// Warn against use of LLVM specific feature names on the CLI. // Warn against use of LLVM specific feature names and unstable features on the CLI.
if diagnostics && !supported_features.iter().any(|&(v, _)| v == feature) { if diagnostics {
let rust_feature = supported_features.iter().find_map(|&(rust_feature, _)| { let feature_state = supported_features.iter().find(|&&(v, _)| v == feature);
let llvm_features = to_llvm_features(sess, rust_feature); if feature_state.is_none() {
if llvm_features.contains(&feature) && !llvm_features.contains(&rust_feature) { let rust_feature = supported_features.iter().find_map(|&(rust_feature, _)| {
Some(rust_feature) let llvm_features = to_llvm_features(sess, rust_feature);
if llvm_features.contains(&feature)
&& !llvm_features.contains(&rust_feature)
{
Some(rust_feature)
} else {
None
}
});
let unknown_feature = if let Some(rust_feature) = rust_feature {
UnknownCTargetFeature {
feature,
rust_feature: PossibleFeature::Some { rust_feature },
}
} else { } else {
None UnknownCTargetFeature { feature, rust_feature: PossibleFeature::None }
} };
}); sess.emit_warning(unknown_feature);
let unknown_feature = if let Some(rust_feature) = rust_feature { } else if feature_state.is_some_and(|(_name, feature_gate)| feature_gate.is_some())
UnknownCTargetFeature { {
feature, // An unstable feature. Warn about using it.
rust_feature: PossibleFeature::Some { rust_feature }, sess.emit_warning(UnstableCTargetFeature { feature });
} }
} else {
UnknownCTargetFeature { feature, rust_feature: PossibleFeature::None }
};
sess.emit_warning(unknown_feature);
} }
if diagnostics { if diagnostics {

View File

@ -23,6 +23,15 @@
// check whether they're named already elsewhere in rust // check whether they're named already elsewhere in rust
// e.g. in stdarch and whether the given name matches LLVM's // e.g. in stdarch and whether the given name matches LLVM's
// if it doesn't, to_llvm_feature in llvm_util in rustc_codegen_llvm needs to be adapted // if it doesn't, to_llvm_feature in llvm_util in rustc_codegen_llvm needs to be adapted
//
// When adding a new feature, be particularly mindful of features that affect function ABIs. Those
// need to be treated very carefully to avoid introducing unsoundness! This often affects features
// that enable/disable hardfloat support (see https://github.com/rust-lang/rust/issues/116344 for an
// example of this going wrong), but features enabling new SIMD registers are also a concern (see
// https://github.com/rust-lang/rust/issues/116558 for an example of this going wrong).
//
// Stabilizing a target feature (setting the 2nd component of the pair to `None`) requires t-lang
// approval.
const ARM_ALLOWED_FEATURES: &[(&str, Option<Symbol>)] = &[ const ARM_ALLOWED_FEATURES: &[(&str, Option<Symbol>)] = &[
// tidy-alphabetical-start // tidy-alphabetical-start

View File

@ -1,6 +1,6 @@
warning: unknown feature specified for `-Ctarget-feature`: `rdrnd` warning: unknown and unstable feature specified for `-Ctarget-feature`: `rdrnd`
| |
= note: it is still passed through to the codegen backend = note: it is still passed through to the codegen backend, but use of this feature might be unsound and the behavior of this feature can change in the future
= help: you might have meant: `rdrand` = help: you might have meant: `rdrand`
warning: 1 warning emitted warning: 1 warning emitted

View File

@ -0,0 +1,6 @@
// compile-flags: -Ctarget-feature=+vaes --crate-type=rlib --target=x86_64-unknown-linux-gnu
// build-pass
// needs-llvm-components: x86
#![feature(no_core)]
#![no_core]

View File

@ -0,0 +1,6 @@
warning: unstable feature specified for `-Ctarget-feature`: `vaes`
|
= note: this feature is not stably supported; its behavior can change in the future
warning: 1 warning emitted