Mark IFN_UBSAN_CHECK_ADD/MUL as commutative

gcc/
	* internal-fn.c (commutative_binary_fn_p): Handle IFN_UBSAN_CHECK_ADD
	and IFN_UBSAN_CHECK_MUL.

gcc/testsuite/
	* gcc.dg/ubsan/commutative-1.c: New test.

2 files changed, 32 insertions, 0 deletions

diff --git a/gcc/internal-fn.c b/gcc/internal-fn.c
index 3d4055d..0e377b1 100644
--- a/gcc/internal-fn.c
+++ b/gcc/internal-fn.c
@@ -3832,6 +3832,8 @@ commutative_binary_fn_p (internal_fn fn)
     case IFN_FMIN:
     case IFN_FMAX:
     case IFN_COMPLEX_MUL:
+    case IFN_UBSAN_CHECK_ADD:
+    case IFN_UBSAN_CHECK_MUL:
       return true;
 
     default:
diff --git a/gcc/testsuite/gcc.dg/ubsan/commutative-1.c b/gcc/testsuite/gcc.dg/ubsan/commutative-1.c
new file mode 100644
index 0000000..128f5b1
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/ubsan/commutative-1.c
@@ -0,0 +1,30 @@
+/* { dg-do compile } */
+/* { dg-options "-fsanitize=undefined -fdump-tree-optimized" } */
+/* { dg-skip-if "" { *-*-* } { "-O0" "-flto" } { "" } } */
+
+int res[2];
+
+void
+f1 (int x, int y)
+{
+  res[0] = x + y;
+  res[1] = y + x;
+}
+
+void
+f2 (int x, int y)
+{
+  res[0] = x - y;
+  res[1] = y - x;
+}
+
+void
+f3 (int x, int y)
+{
+  res[0] = x * y;
+  res[1] = y * x;
+}
+
+/* { dg-final { scan-tree-dump-times {\.UBSAN_CHECK_ADD} 1 "optimized" } } */
+/* { dg-final { scan-tree-dump-times {\.UBSAN_CHECK_SUB} 2 "optimized" } } */
+/* { dg-final { scan-tree-dump-times {\.UBSAN_CHECK_MUL} 1 "optimized" } } */