Store optimize attribute in Option

Author: clubby789

compiler/rustc_attr/src/builtin.rs

@@ -57,7 +57,6 @@ pub enum InstructionSetAttr {
 
 #[derive(Clone, Encodable, Decodable, Debug, HashStable_Generic)]
 pub enum OptimizeAttr {
-    None,
     Speed,
     Size,
 }

compiler/rustc_codegen_llvm/src/attributes.rs

@@ -331,14 +331,14 @@ pub(crate) fn llfn_attrs_from_instance<'ll, 'tcx>(
     let mut to_add = SmallVec::<[_; 16]>::new();
 
     match codegen_fn_attrs.optimize {
-        OptimizeAttr::None => {
+        None => {
             to_add.extend(default_optimisation_attrs(cx));
         }
-        OptimizeAttr::Size => {
+        Some(OptimizeAttr::Size) => {
             to_add.push(llvm::AttributeKind::MinSize.create_attr(cx.llcx));
             to_add.push(llvm::AttributeKind::OptimizeForSize.create_attr(cx.llcx));
         }
-        OptimizeAttr::Speed => {}
+        Some(OptimizeAttr::Speed) => {}
     }
 
     let inline =

compiler/rustc_codegen_ssa/src/base.rs

@@ -1056,8 +1056,9 @@ pub(crate) fn provide(providers: &mut Providers) {
         let any_for_speed = defids.items().any(|id| {
             let CodegenFnAttrs { optimize, .. } = tcx.codegen_fn_attrs(*id);
             match optimize {
-                attr::OptimizeAttr::None | attr::OptimizeAttr::Size => false,
-                attr::OptimizeAttr::Speed => true,
+                None => false,
+                Some(attr::OptimizeAttr::Size) => false,
+                Some(attr::OptimizeAttr::Speed) => true,
             }
         });
 

compiler/rustc_codegen_ssa/src/codegen_attrs.rs

@@ -542,7 +542,7 @@ fn codegen_fn_attrs(tcx: TyCtxt<'_>, did: LocalDefId) -> CodegenFnAttrs {
         }
     });
 
-    codegen_fn_attrs.optimize = attrs.iter().fold(OptimizeAttr::None, |ia, attr| {
+    codegen_fn_attrs.optimize = attrs.iter().fold(None, |ia, attr| {
         if !attr.has_name(sym::optimize) {
             return ia;
         }
@@ -556,14 +556,14 @@ fn codegen_fn_attrs(tcx: TyCtxt<'_>, did: LocalDefId) -> CodegenFnAttrs {
                 inline_span = Some(attr.span);
                 if items.len() != 1 {
                     err(attr.span, "expected one argument");
-                    OptimizeAttr::None
+                    None
                 } else if list_contains_name(items, sym::size) {
-                    OptimizeAttr::Size
+                    Some(OptimizeAttr::Size)
                 } else if list_contains_name(items, sym::speed) {
-                    OptimizeAttr::Speed
+                    Some(OptimizeAttr::Speed)
                 } else {
                     err(items[0].span(), "invalid argument");
-                    OptimizeAttr::None
+                    None
                 }
             }
             Some(MetaItemKind::NameValue(_)) => ia,

compiler/rustc_middle/src/middle/codegen_fn_attrs.rs

@@ -12,7 +12,7 @@ pub struct CodegenFnAttrs {
     /// Parsed representation of the `#[inline]` attribute
     pub inline: InlineAttr,
     /// Parsed representation of the `#[optimize]` attribute
-    pub optimize: OptimizeAttr,
+    pub optimize: Option<OptimizeAttr>,
     /// The `#[export_name = "..."]` attribute, indicating a custom symbol a
     /// function should be exported under
     pub export_name: Option<Symbol>,
@@ -144,7 +144,7 @@ impl CodegenFnAttrs {
         CodegenFnAttrs {
             flags: CodegenFnAttrFlags::empty(),
             inline: InlineAttr::None,
-            optimize: OptimizeAttr::None,
+            optimize: None,
             export_name: None,
             link_name: None,
             link_ordinal: None,