codegen_attrs: force inlining takes precedence

Author: davidtwco

compiler/rustc_codegen_ssa/src/codegen_attrs.rs

@@ -523,41 +523,46 @@ fn codegen_fn_attrs(tcx: TyCtxt<'_>, did: LocalDefId) -> CodegenFnAttrs {
  mixed_export_name_no_mangle_lint_state.lint_if_mixed(tcx);
 
  codegen_fn_attrs.inline = attrs.iter().fold(InlineAttr::None, |ia, attr| {
-if attr.has_name(sym::inline){
-if attr.is_word(){
-InlineAttr::Hint
-}elseifletSome(ref items) = attr.meta_item_list(){
- inline_span = Some(attr.span);
-if items.len() != 1{
-struct_span_code_err!(tcx.dcx(), attr.span,E0534,"expected one argument").emit();
-InlineAttr::None
-}elseiflist_contains_name(items, sym::always){
-InlineAttr::Always
-}elseiflist_contains_name(items, sym::never){
-InlineAttr::Never
-}else{
-struct_span_code_err!(tcx.dcx(), items[0].span(),E0535,"invalid argument")
-.with_help("valid inline arguments are `always` and `never`")
-.emit();
+if !attr.has_name(sym::inline){
+return ia;
+}
 
-InlineAttr::None
-}
-}else{
- ia
-}
-}elseif attr.has_name(sym::rustc_force_inline) && tcx.features().rustc_attrs(){
-if attr.is_word(){
-InlineAttr::Force{attr_span: attr.span,reason:None}
-}elseifletSome(val) = attr.value_str(){
-InlineAttr::Force{attr_span: attr.span,reason:Some(val)}
+if attr.is_word(){
+InlineAttr::Hint
+}elseifletSome(ref items) = attr.meta_item_list(){
+ inline_span = Some(attr.span);
+if items.len() != 1{
+struct_span_code_err!(tcx.dcx(), attr.span,E0534,"expected one argument").emit();
+InlineAttr::None
+}elseiflist_contains_name(items, sym::always){
+InlineAttr::Always
+}elseiflist_contains_name(items, sym::never){
+InlineAttr::Never
 }else{
-debug!("`rustc_force_inline` not checked by attribute validation");
- ia
+struct_span_code_err!(tcx.dcx(), items[0].span(),E0535,"invalid argument")
+.with_help("valid inline arguments are `always` and `never`")
+.emit();
+
+InlineAttr::None
 }
 }else{
  ia
 }
 });
+ codegen_fn_attrs.inline = attrs.iter().fold(codegen_fn_attrs.inline, |ia, attr| {
+if !attr.has_name(sym::rustc_force_inline) || !tcx.features().rustc_attrs(){
+return ia;
+}
+
+if attr.is_word(){
+InlineAttr::Force{attr_span: attr.span,reason:None}
+}elseifletSome(val) = attr.value_str(){
+InlineAttr::Force{attr_span: attr.span,reason:Some(val)}
+}else{
+debug!("`rustc_force_inline` not checked by attribute validation");
+ ia
+}
+});
 
 // naked function MUST NOT be inlined! This attribute is required for the rust compiler itself,
 // but not for the code generation backend because at that point the naked function will just be