On Wed, Nov 12, 2014 at 01:05:15PM +0300, Yury Gribov wrote: > On 11/12/2014 04:52 AM, H.J. Lu wrote: > >Hi, > > > >This patch updates c-c++-common/asan/strlen-overflow-1.c to avoid tail > >call on x32. Tested on Linux/x86-64/ia32/x32. OK to install? > > > >Thanks. > > > >H.J. > >--- > >2014-11-11 H.J. Lu <hongjiu...@intel.com> > > > > PR testsuite/63830 > > * c-c++-common/asan/strlen-overflow-1.c (main): Avoid tail call. > > > >diff --git a/gcc/testsuite/c-c++-common/asan/strlen-overflow-1.c > >b/gcc/testsuite/c-c++-common/asan/strlen-overflow-1.c > >index 0f49286..33696ed 100644 > >--- a/gcc/testsuite/c-c++-common/asan/strlen-overflow-1.c > >+++ b/gcc/testsuite/c-c++-common/asan/strlen-overflow-1.c > >@@ -16,7 +16,7 @@ int main () { > > char *p = &a[0]; > > asm ("" : "+r"(p)); > > __asan_poison_memory_region ((char *)&a[1], 1); > >- return __builtin_strlen (a); > >+ return __builtin_strlen (a) + 1; > > } > > > > /* { dg-output "READ of size 2 at 0x\[0-9a-f\]+ thread T0.*(\n|\r\n|\r)" } > > */ > > > > Cc Jakub. > > The patch looks sane but I wonder whether we should drop the test completely > now that we don't inline instrument builtins anymore.
When it is already written, I'd keep it. H.J., your patch is ok for trunk. Jakub