From 3de2a40ecdfa37efa403d4b46ef116225acb0dc0 Mon Sep 17 00:00:00 2001 From: Ilya Enkovich Date: Tue, 24 Nov 2015 09:45:20 +0000 Subject: [PATCH] re PR c/68337 ([MPX] memcpy() for arrays with function pointers results in huge resource usage and binaries) gcc/ PR c/68337 * gimple-fold.c: Include ipa-chkp.h. (gimple_fold_builtin_memory_op): Don't fold call if we are going to instrument it and it may copy pointers. gcc/testsuite/ PR c/68337 * gcc.target/i386/mpx/pr68337-1.c: New test. * gcc.target/i386/mpx/pr68337-2.c: New test. From-SVN: r230796 --- gcc/ChangeLog | 7 ++++ gcc/gimple-fold.c | 13 ++++++++ gcc/testsuite/ChangeLog | 6 ++++ gcc/testsuite/gcc.target/i386/mpx/pr68337-1.c | 32 +++++++++++++++++++ gcc/testsuite/gcc.target/i386/mpx/pr68337-2.c | 9 ++++++ 5 files changed, 67 insertions(+) create mode 100644 gcc/testsuite/gcc.target/i386/mpx/pr68337-1.c create mode 100644 gcc/testsuite/gcc.target/i386/mpx/pr68337-2.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 323c4a87426..d8a58721eb5 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2015-11-24 Ilya Enkovich + + PR c/68337 + * gimple-fold.c: Include ipa-chkp.h. + (gimple_fold_builtin_memory_op): Don't fold call if we + are going to instrument it and it may copy pointers. + 2015-11-24 Bernd Schmidt Kyrylo Tkachov diff --git a/gcc/gimple-fold.c b/gcc/gimple-fold.c index 1ab20d11fa7..6ff5e266d42 100644 --- a/gcc/gimple-fold.c +++ b/gcc/gimple-fold.c @@ -53,6 +53,7 @@ along with GCC; see the file COPYING3. If not see #include "gomp-constants.h" #include "optabs-query.h" #include "omp-low.h" +#include "ipa-chkp.h" /* Return true when DECL can be referenced from current unit. @@ -664,6 +665,18 @@ gimple_fold_builtin_memory_op (gimple_stmt_iterator *gsi, unsigned int src_align, dest_align; tree off0; + /* Inlining of memcpy/memmove may cause bounds lost (if we copy + pointers as wide integer) and also may result in huge function + size because of inlined bounds copy. Thus don't inline for + functions we want to instrument. */ + if (flag_check_pointer_bounds + && chkp_instrumentable_p (cfun->decl) + /* Even if data may contain pointers we can inline if copy + less than a pointer size. */ + && (!tree_fits_uhwi_p (len) + || compare_tree_int (len, POINTER_SIZE_UNITS) >= 0)) + return false; + /* Build accesses at offset zero with a ref-all character type. */ off0 = build_int_cst (build_pointer_type_for_mode (char_type_node, ptr_mode, true), 0); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 522b24bc058..6c98a6fe51f 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2015-11-24 Ilya Enkovich + + PR c/68337 + * gcc.target/i386/mpx/pr68337-1.c: New test. + * gcc.target/i386/mpx/pr68337-2.c: New test. + 2015-11-24 Kyrylo Tkachov PR rtl-optimization/68194 diff --git a/gcc/testsuite/gcc.target/i386/mpx/pr68337-1.c b/gcc/testsuite/gcc.target/i386/mpx/pr68337-1.c new file mode 100644 index 00000000000..3f8d79d4282 --- /dev/null +++ b/gcc/testsuite/gcc.target/i386/mpx/pr68337-1.c @@ -0,0 +1,32 @@ +/* { dg-do run } */ +/* { dg-options "-fcheck-pointer-bounds -mmpx" } */ + +#include "mpx-check.h" + +#define N 2 + +extern void abort (); + +static int +mpx_test (int argc, const char **argv) +{ + char ** src = (char **)malloc (sizeof (char *) * N); + char ** dst = (char **)malloc (sizeof (char *) * N); + int i; + + for (i = 0; i < N; i++) + src[i] = __bnd_set_ptr_bounds (argv[0] + i, i + 1); + + __builtin_memcpy(dst, src, sizeof (char *) * N); + + for (i = 0; i < N; i++) + { + char *p = dst[i]; + if (p != argv[0] + i + || __bnd_get_ptr_lbound (p) != p + || __bnd_get_ptr_ubound (p) != p + i) + abort (); + } + + return 0; +} diff --git a/gcc/testsuite/gcc.target/i386/mpx/pr68337-2.c b/gcc/testsuite/gcc.target/i386/mpx/pr68337-2.c new file mode 100644 index 00000000000..8845cca79be --- /dev/null +++ b/gcc/testsuite/gcc.target/i386/mpx/pr68337-2.c @@ -0,0 +1,9 @@ +/* { dg-do compile } */ +/* { dg-options "-fcheck-pointer-bounds -mmpx" } */ +/* { dg-final { scan-assembler-not "memcpy" } } */ + +void +test (void *dst, void *src) +{ + __builtin_memcpy (dst, src, sizeof (char *) / 2); +} -- 2.30.2