aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2024-02-01 09:16:57 +0100
committerJakub Jelinek <jakub@redhat.com>2024-02-01 09:16:57 +0100
commitceb242f5302027c44a7dca86c344863004b6fec4 (patch)
tree99ae31025db77aa59d9fbbe364531a41982c8a92
parent2f14c0dbb789852947cb58fdf7d3162413f053fa (diff)
downloadgcc-ceb242f5302027c44a7dca86c344863004b6fec4.zip
gcc-ceb242f5302027c44a7dca86c344863004b6fec4.tar.gz
gcc-ceb242f5302027c44a7dca86c344863004b6fec4.tar.bz2
gimple-low: Remove .ASAN_MARK calls on TREE_STATIC variables [PR113531]
Since the r14-1500-g4d935f52b0d5c0 commit we promote an initializer_list backing array to static storage where appropriate, but this happens after we decided to add it to asan_poisoned_variables. As a result we add unpoison/poison for it to the gimple. But then sanopt removes the unpoison. So the second time we call the function and want to load from the array asan still considers it poisoned. The following patch fixes it by removing the .ASAN_MARK internal calls during gimple lowering if they refer to TREE_STATIC vars. 2024-02-01 Jakub Jelinek <jakub@redhat.com> Jason Merrill <jason@redhat.com> PR c++/113531 * gimple-low.cc (lower_stmt): Remove .ASAN_MARK calls on variables which were promoted to TREE_STATIC. * g++.dg/asan/initlist1.C: New test. Co-authored-by: Jason Merrill <jason@redhat.com>
-rw-r--r--gcc/gimple-low.cc15
-rw-r--r--gcc/testsuite/g++.dg/asan/initlist1.C20
2 files changed, 35 insertions, 0 deletions
diff --git a/gcc/gimple-low.cc b/gcc/gimple-low.cc
index 0fca974..e19fc2c 100644
--- a/gcc/gimple-low.cc
+++ b/gcc/gimple-low.cc
@@ -790,6 +790,21 @@ lower_stmt (gimple_stmt_iterator *gsi, struct lower_data *data)
return;
}
+ if (gimple_call_internal_p (stmt, IFN_ASAN_MARK))
+ {
+ tree base = gimple_call_arg (stmt, 1);
+ gcc_checking_assert (TREE_CODE (base) == ADDR_EXPR);
+ tree decl = TREE_OPERAND (base, 0);
+ if (VAR_P (decl) && TREE_STATIC (decl))
+ {
+ /* Don't poison a variable with static storage; it might have
+ gotten marked before gimplify_init_constructor promoted it
+ to static. */
+ gsi_remove (gsi, true);
+ return;
+ }
+ }
+
/* We delay folding of built calls from gimplification to
here so the IL is in consistent state for the diagnostic
machineries job. */
diff --git a/gcc/testsuite/g++.dg/asan/initlist1.C b/gcc/testsuite/g++.dg/asan/initlist1.C
new file mode 100644
index 0000000..6cd5b7d
--- /dev/null
+++ b/gcc/testsuite/g++.dg/asan/initlist1.C
@@ -0,0 +1,20 @@
+// PR c++/113531
+// { dg-do run { target c++11 } }
+// { dg-additional-options "-fsanitize=address" }
+
+#include <initializer_list>
+
+void f(int) { }
+
+void g()
+{
+ for (auto i : { 1, 2, 3 })
+ f (i);
+ f(42);
+}
+
+int main()
+{
+ g();
+ g();
+}