[Bug target/128360] i386: __attribute__((cf_check)) on static/localized function silently omits ENDBR under -fcf-protection=branch -mmanual-endbr

[ubizjak at gmail dot com via Gcc-bugs]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=128360

--- Comment #2 from Uroš Bizjak <ubizjak at gmail dot com> ---
diff --git a/gcc/config/i386/i386-features.cc
b/gcc/config/i386/i386-features.cc
index 83768b3b2bc..430e2b910e5 100644
--- a/gcc/config/i386/i386-features.cc
+++ b/gcc/config/i386/i386-features.cc
@@ -3149,15 +3149,14 @@ rest_of_insert_endbr_and_patchable_area (bool
need_endbr,
         EB.  */
       if (!lookup_attribute ("nocf_check",
                             TYPE_ATTRIBUTES (TREE_TYPE (cfun->decl)))
-         && (!flag_manual_endbr
-             || lookup_attribute ("cf_check",
-                                  DECL_ATTRIBUTES (cfun->decl)))
-         && (!cgraph_node::get (cfun->decl)->only_called_directly_p ()
-             || ix86_cmodel == CM_LARGE
-             || ix86_cmodel == CM_LARGE_PIC
-             || flag_force_indirect_call
-             || (TARGET_DLLIMPORT_DECL_ATTRIBUTES
-                 && DECL_DLLIMPORT_P (cfun->decl))))
+         && (lookup_attribute ("cf_check", DECL_ATTRIBUTES (cfun->decl))
+             || (!flag_manual_endbr
+                 && (!cgraph_node::get (cfun->decl)->only_called_directly_p ()
+                     || ix86_cmodel == CM_LARGE
+                     || ix86_cmodel == CM_LARGE_PIC
+                     || flag_force_indirect_call
+                     || (TARGET_DLLIMPORT_DECL_ATTRIBUTES
+                         && DECL_DLLIMPORT_P (cfun->decl))))))
        {
          if (crtl->profile && flag_fentry)
            {