[gcc r14-10180] tree-inline: Remove .ASAN_MARK calls when inlining functions into no_sanitize callers [PR114956]

[Jakub Jelinek via Gcc-cvs]

https://gcc.gnu.org/g:aca573ea64ccfd54d4447e9a3200acd7a9157082

commit r14-10180-gaca573ea64ccfd54d4447e9a3200acd7a9157082
Author: Jakub Jelinek <ja...@redhat.com>
Date:   Tue May 7 21:29:14 2024 +0200

    tree-inline: Remove .ASAN_MARK calls when inlining functions into 
no_sanitize callers [PR114956]
    
    In r9-5742 we've started allowing to inline always_inline functions into
    functions which have disabled e.g. address sanitization even when the
    always_inline function is implicitly from command line options sanitized.
    
    This mostly works fine because most of the asan instrumentation is done only
    late after ipa, but as the following testcase the .ASAN_MARK ifn calls
    gimplifier adds can result in ICEs.
    
    Fixed by dropping those during inlining, similarly to how we drop
    .TSAN_FUNC_EXIT calls.
    
    2024-05-07  Jakub Jelinek  <ja...@redhat.com>
    
            PR sanitizer/114956
            * tree-inline.cc: Include asan.h.
            (copy_bb): Remove also .ASAN_MARK calls if id->dst_fn has 
asan/hwasan
            sanitization disabled.
    
            * gcc.dg/asan/pr114956.c: New test.
    
    (cherry picked from commit d4e25cf4f7c1f51a8824cc62bbb85a81a41b829a)

Diff:
---
 gcc/testsuite/gcc.dg/asan/pr114956.c | 26 ++++++++++++++++++++++++++
 gcc/tree-inline.cc                   | 28 +++++++++++++++++++++-------
 2 files changed, 47 insertions(+), 7 deletions(-)

diff --git a/gcc/testsuite/gcc.dg/asan/pr114956.c 
b/gcc/testsuite/gcc.dg/asan/pr114956.c
new file mode 100644
index 000000000000..fb87d514f255
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/asan/pr114956.c
@@ -0,0 +1,26 @@
+/* PR sanitizer/114956 */
+/* { dg-do compile } */
+/* { dg-options "-O2 -fsanitize=address,null" } */
+
+int **a;
+void qux (int *);
+
+__attribute__((always_inline)) static inline int *
+foo (void)
+{
+  int b[1];
+  qux (b);
+  return a[1];
+}
+
+__attribute__((no_sanitize_address)) void
+bar (void)
+{
+  *a = foo ();
+}
+
+void
+baz (void)
+{
+  bar ();
+}
diff --git a/gcc/tree-inline.cc b/gcc/tree-inline.cc
index 238afb7de80e..5f427608d778 100644
--- a/gcc/tree-inline.cc
+++ b/gcc/tree-inline.cc
@@ -65,6 +65,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "symbol-summary.h"
 #include "symtab-thunks.h"
 #include "symtab-clones.h"
+#include "asan.h"
 
 /* I'm not real happy about this, but we need to handle gimple and
    non-gimple trees.  */
@@ -2226,13 +2227,26 @@ copy_bb (copy_body_data *id, basic_block bb,
            }
          else if (call_stmt
                   && id->call_stmt
-                  && gimple_call_internal_p (stmt)
-                  && gimple_call_internal_fn (stmt) == IFN_TSAN_FUNC_EXIT)
-           {
-             /* Drop TSAN_FUNC_EXIT () internal calls during inlining.  */
-             gsi_remove (&copy_gsi, false);
-             continue;
-           }
+                  && gimple_call_internal_p (stmt))
+           switch (gimple_call_internal_fn (stmt))
+             {
+             case IFN_TSAN_FUNC_EXIT:
+               /* Drop .TSAN_FUNC_EXIT () internal calls during inlining.  */
+               gsi_remove (&copy_gsi, false);
+               continue;
+             case IFN_ASAN_MARK:
+               /* Drop .ASAN_MARK internal calls during inlining into
+                  no_sanitize functions.  */
+               if (!sanitize_flags_p (SANITIZE_ADDRESS, id->dst_fn)
+                   && !sanitize_flags_p (SANITIZE_HWADDRESS, id->dst_fn))
+                 {
+                   gsi_remove (&copy_gsi, false);
+                   continue;
+                 }
+               break;
+             default:
+               break;
+             }
 
          /* Statements produced by inlining can be unfolded, especially
             when we constant propagated some operands.  We can't fold