codegen_attrs: force inlining takes precedence

Author: davidtwco

compiler/rustc_codegen_ssa/src/codegen_attrs.rs

@@ -552,7 +552,12 @@ fn codegen_fn_attrs(tcx: TyCtxt<'_>, did: LocalDefId) -> CodegenFnAttrs {
                 Some(MetaItemKind::NameValue(_)) => ia,
                 None => ia,
             }
-        } else if attr.has_name(sym::rustc_force_inline) && tcx.features().rustc_attrs() {
+        } 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() {
             match attr.meta_kind() {
                 Some(MetaItemKind::NameValue(lit)) => {
                     InlineAttr::Force { attr_span: attr.span, reason: Some(lit.symbol) }