diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/ipa-inline.c | 6 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/c-c++-common/asan/pr89124.c | 14 |
4 files changed, 31 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index d116632..a220d57 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2019-01-31 Jakub Jelinek <jakub@redhat.com> + + PR sanitizer/89124 + * ipa-inline.c (sanitize_attrs_match_for_inline_p): Allow inlining + always_inline callees into no_sanitize_address callers. + 2019-01-31 Richard Biener <rguenther@suse.de> PR rtl-optimization/89115 diff --git a/gcc/ipa-inline.c b/gcc/ipa-inline.c index 2c1843a..4ddbfdf 100644 --- a/gcc/ipa-inline.c +++ b/gcc/ipa-inline.c @@ -264,6 +264,12 @@ sanitize_attrs_match_for_inline_p (const_tree caller, const_tree callee) if (!caller || !callee) return true; + /* Allow inlining always_inline functions into no_sanitize_address + functions. */ + if (!sanitize_flags_p (SANITIZE_ADDRESS, caller) + && lookup_attribute ("always_inline", DECL_ATTRIBUTES (callee))) + return true; + return ((sanitize_flags_p (SANITIZE_ADDRESS, caller) == sanitize_flags_p (SANITIZE_ADDRESS, callee)) && (sanitize_flags_p (SANITIZE_POINTER_COMPARE, caller) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 917c13e..48f4bbd 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2019-01-31 Jakub Jelinek <jakub@redhat.com> + + PR sanitizer/89124 + * c-c++-common/asan/pr89124.c: New test. + 2019-01-30 Jerry DeLisle <jvdelisle@gcc.gnu.org> PR fortran/52564 diff --git a/gcc/testsuite/c-c++-common/asan/pr89124.c b/gcc/testsuite/c-c++-common/asan/pr89124.c new file mode 100644 index 0000000..c9c870b --- /dev/null +++ b/gcc/testsuite/c-c++-common/asan/pr89124.c @@ -0,0 +1,14 @@ +/* PR sanitizer/89124 */ +/* { dg-do compile } */ + +static int inline __attribute__ ((always_inline)) +foo (int x) +{ + return x + 1; +} + +__attribute__ ((no_sanitize_address)) int +bar (int x) +{ + return foo (x); +} |