]> git.ipfire.org Git - thirdparty/gcc.git/commitdiff
ubsan: ubsan_maybe_instrument_array_ref tweak
authorMarek Polacek <polacek@redhat.com>
Thu, 9 Mar 2023 23:43:34 +0000 (18:43 -0500)
committerMarek Polacek <polacek@redhat.com>
Mon, 1 May 2023 21:50:28 +0000 (17:50 -0400)
In <https://gcc.gnu.org/pipermail/gcc-patches/2023-March/613687.html>
we discussed that the copy_node in ubsan_maybe_instrument_array_ref
is redundant, but also that it'd be best to postpone the optimization
to GCC 14.  So I'm making that change now.

gcc/c-family/ChangeLog:

* c-ubsan.cc (ubsan_maybe_instrument_array_ref): Don't copy_node.

gcc/c-family/c-ubsan.cc

index c3ae515306cfbe9ee773383f1f222582fdce5cf3..cfb7cbf389cac3c51a4811ee139a51079530aa62 100644 (file)
@@ -505,12 +505,8 @@ ubsan_maybe_instrument_array_ref (tree *expr_p, bool ignore_off_by_one)
       tree e = ubsan_instrument_bounds (EXPR_LOCATION (*expr_p), op0, &op1,
                                        ignore_off_by_one);
       if (e != NULL_TREE)
-       {
-         tree t = copy_node (*expr_p);
-         TREE_OPERAND (t, 1) = build2 (COMPOUND_EXPR, TREE_TYPE (op1),
-                                       e, op1);
-         *expr_p = t;
-       }
+       TREE_OPERAND (*expr_p, 1) = build2 (COMPOUND_EXPR, TREE_TYPE (op1),
+                                           e, op1);
     }
 }