bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rename OptimizeAttr::None to Default

Browse source
This commit is contained in:
clubby789 2025-01-24 19:34:01 +00:00
parent 7a9661d768
commit 5ac95a5c47
4 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
compiler/rustc_attr_data_structures/src/attributes.rs
View file

@ -35,9 +35,11 @@ pub enum InstructionSetAttr {
ArmT32, ArmT32,
} }
#[derive(Clone, Encodable, Decodable, Debug, HashStable_Generic)] #[derive(Clone, Encodable, Decodable, Debug, PartialEq, Eq, HashStable_Generic, Default)]
pub enum OptimizeAttr { pub enum OptimizeAttr {
None, /// No `#[optimize(..)]` attribute
#[default]
Default,
/// `#[optimize(none)]` /// `#[optimize(none)]`
DoNotOptimize, DoNotOptimize,
/// `#[optimize(speed)]` /// `#[optimize(speed)]`

2
compiler/rustc_codegen_llvm/src/attributes.rs
View file

@ -333,7 +333,7 @@ pub(crate) fn llfn_attrs_from_instance<'ll, 'tcx>(
let mut to_add = SmallVec::<[_; 16]>::new(); let mut to_add = SmallVec::<[_; 16]>::new();
match codegen_fn_attrs.optimize { match codegen_fn_attrs.optimize {
OptimizeAttr::None => { OptimizeAttr::Default => {
to_add.extend(default_optimisation_attrs(cx)); to_add.extend(default_optimisation_attrs(cx));
} }
OptimizeAttr::DoNotOptimize => { OptimizeAttr::DoNotOptimize => {

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

@ -575,7 +575,7 @@ fn codegen_fn_attrs(tcx: TyCtxt<'_>, did: LocalDefId) -> CodegenFnAttrs {
codegen_fn_attrs.inline = InlineAttr::Never; codegen_fn_attrs.inline = InlineAttr::Never;
} }
codegen_fn_attrs.optimize = attrs.iter().fold(OptimizeAttr::None, |ia, attr| { codegen_fn_attrs.optimize = attrs.iter().fold(OptimizeAttr::Default, |ia, attr| {
if !attr.has_name(sym::optimize) { if !attr.has_name(sym::optimize) {
return ia; return ia;
} }
@ -587,7 +587,7 @@ fn codegen_fn_attrs(tcx: TyCtxt<'_>, did: LocalDefId) -> CodegenFnAttrs {
inline_span = Some(attr.span); inline_span = Some(attr.span);
if items.len() != 1 { if items.len() != 1 {
err(attr.span, "expected one argument"); err(attr.span, "expected one argument");
OptimizeAttr::None OptimizeAttr::Default
} else if list_contains_name(items, sym::size) { } else if list_contains_name(items, sym::size) {
OptimizeAttr::Size OptimizeAttr::Size
} else if list_contains_name(items, sym::speed) { } else if list_contains_name(items, sym::speed) {
@ -596,10 +596,10 @@ fn codegen_fn_attrs(tcx: TyCtxt<'_>, did: LocalDefId) -> CodegenFnAttrs {
OptimizeAttr::DoNotOptimize OptimizeAttr::DoNotOptimize
} else { } else {
err(items[0].span(), "invalid argument"); err(items[0].span(), "invalid argument");
OptimizeAttr::None OptimizeAttr::Default
} }
} else { } else {
OptimizeAttr::None OptimizeAttr::Default
} }
}); });

2
compiler/rustc_middle/src/middle/codegen_fn_attrs.rs
View file

@ -147,7 +147,7 @@ impl CodegenFnAttrs {
CodegenFnAttrs { CodegenFnAttrs {
flags: CodegenFnAttrFlags::empty(), flags: CodegenFnAttrFlags::empty(),
inline: InlineAttr::None, inline: InlineAttr::None,
optimize: OptimizeAttr::None, optimize: OptimizeAttr::Default,
export_name: None, export_name: None,
link_name: None, link_name: None,
link_ordinal: None, link_ordinal: None,