From 4e722cf1dc7dd6087ddf8f861e24a9d4ad4bbd6a Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Fri, 4 Dec 2015 17:32:22 +0100 Subject: [PATCH] re PR tree-optimization/68680 (On-stack VLA does not cause instrumentation with -fstack-protector) PR tree-optimization/68680 * calls.c (special_function_p): Return ECF_MAY_BE_ALLOCA for BUILT_IN_ALLOCA{,_WITH_ALIGN}. Don't check for __builtin_alloca by name. * gcc.target/i386/pr68680.c: New test. From-SVN: r231279 --- gcc/ChangeLog | 5 +++++ gcc/calls.c | 20 ++++++++++++++------ gcc/testsuite/ChangeLog | 3 +++ gcc/testsuite/gcc.target/i386/pr68680.c | 15 +++++++++++++++ 4 files changed, 37 insertions(+), 6 deletions(-) create mode 100644 gcc/testsuite/gcc.target/i386/pr68680.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 446e74b3468..b6ff6e162f5 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,10 @@ 2015-12-04 Jakub Jelinek + PR tree-optimization/68680 + * calls.c (special_function_p): Return ECF_MAY_BE_ALLOCA for + BUILT_IN_ALLOCA{,_WITH_ALIGN}. Don't check for __builtin_alloca + by name. + PR tree-optimization/68671 * tree-ssa-reassoc.c (maybe_optimize_range_tests): For basic blocks starting with the successor of first bb we've modified diff --git a/gcc/calls.c b/gcc/calls.c index 6cbe01970c1..1eb4ec7549f 100644 --- a/gcc/calls.c +++ b/gcc/calls.c @@ -502,12 +502,9 @@ special_function_p (const_tree fndecl, int flags) /* We assume that alloca will always be called by name. It makes no sense to pass it as a pointer-to-function to anything that does not understand its behavior. */ - if (((IDENTIFIER_LENGTH (name_decl) == 6 - && name[0] == 'a' - && ! strcmp (name, "alloca")) - || (IDENTIFIER_LENGTH (name_decl) == 16 - && name[0] == '_' - && ! strcmp (name, "__builtin_alloca")))) + if (IDENTIFIER_LENGTH (name_decl) == 6 + && name[0] == 'a' + && ! strcmp (name, "alloca")) flags |= ECF_MAY_BE_ALLOCA; /* Disregard prefix _, __, __x or __builtin_. */ @@ -553,6 +550,17 @@ special_function_p (const_tree fndecl, int flags) flags |= ECF_NORETURN; } + if (DECL_BUILT_IN_CLASS (fndecl) == BUILT_IN_NORMAL) + switch (DECL_FUNCTION_CODE (fndecl)) + { + case BUILT_IN_ALLOCA: + case BUILT_IN_ALLOCA_WITH_ALIGN: + flags |= ECF_MAY_BE_ALLOCA; + break; + default: + break; + } + return flags; } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 1a037e6c1dc..b36591a1847 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,8 @@ 2015-12-04 Jakub Jelinek + PR tree-optimization/68680 + * gcc.target/i386/pr68680.c: New test. + PR tree-optimization/68671 * gcc.dg/pr68671.c: New test. diff --git a/gcc/testsuite/gcc.target/i386/pr68680.c b/gcc/testsuite/gcc.target/i386/pr68680.c new file mode 100644 index 00000000000..5524e156362 --- /dev/null +++ b/gcc/testsuite/gcc.target/i386/pr68680.c @@ -0,0 +1,15 @@ +/* PR tree-optimization/68680 */ +/* { dg-do compile } */ +/* { dg-options "-O2 -fstack-protector-strong" } */ + +int foo (char *); + +int +bar (unsigned long x) +{ + char a[x]; + return foo (a); +} + +/* Verify that this function is stack protected. */ +/* { dg-final { scan-assembler "stack_chk_fail" } } */ -- 2.30.2