From 673a107a4003834ec3d6e8f413bda3c13b6062e7 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Fri, 29 Jul 2016 14:00:43 +0200 Subject: [PATCH] re PR c/71969 (Wrong setting of DECL_DISREGARD_INLINE_LIMITS in the C FE) PR c/71969 * c-decl.c (finish_function): Only set DECL_DISREGARD_INLINE_LIMITS on GNU extern inline functions. * gcc.dg/alias-11.c (add_cfi, new_cfi): Change __inline__ to static __inline__. * gcc.dg/pr71969-1.c: New test. * gcc.dg/pr71969-2.c: New test. * gcc.dg/pr71969-3.c: New test. From-SVN: r238862 --- gcc/c/ChangeLog | 6 +++++ gcc/c/c-decl.c | 4 +++- gcc/testsuite/ChangeLog | 9 ++++++++ gcc/testsuite/gcc.dg/alias-11.c | 4 ++-- gcc/testsuite/gcc.dg/pr71969-1.c | 37 +++++++++++++++++++++++++++++++ gcc/testsuite/gcc.dg/pr71969-2.c | 23 +++++++++++++++++++ gcc/testsuite/gcc.dg/pr71969-3.c | 38 ++++++++++++++++++++++++++++++++ 7 files changed, 118 insertions(+), 3 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/pr71969-1.c create mode 100644 gcc/testsuite/gcc.dg/pr71969-2.c create mode 100644 gcc/testsuite/gcc.dg/pr71969-3.c diff --git a/gcc/c/ChangeLog b/gcc/c/ChangeLog index a47b8a3b5ed..d512a3da482 100644 --- a/gcc/c/ChangeLog +++ b/gcc/c/ChangeLog @@ -1,3 +1,9 @@ +2016-07-29 Jakub Jelinek + + PR c/71969 + * c-decl.c (finish_function): Only set DECL_DISREGARD_INLINE_LIMITS + on GNU extern inline functions. + 2016-07-29 Marek Polacek PR c/71583 diff --git a/gcc/c/c-decl.c b/gcc/c/c-decl.c index 41aabeb2972..f2773c5bb72 100644 --- a/gcc/c/c-decl.c +++ b/gcc/c/c-decl.c @@ -9262,7 +9262,9 @@ finish_function (void) /* For GNU C extern inline functions disregard inline limits. */ if (DECL_EXTERNAL (fndecl) - && DECL_DECLARED_INLINE_P (fndecl)) + && DECL_DECLARED_INLINE_P (fndecl) + && (flag_gnu89_inline + || lookup_attribute ("gnu_inline", DECL_ATTRIBUTES (fndecl)))) DECL_DISREGARD_INLINE_LIMITS (fndecl) = 1; /* Genericize before inlining. Delay genericizing nested functions diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index c1df9e98b1a..1bc34b96395 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,12 @@ +2016-07-29 Jakub Jelinek + + PR c/71969 + * gcc.dg/alias-11.c (add_cfi, new_cfi): Change __inline__ to + static __inline__. + * gcc.dg/pr71969-1.c: New test. + * gcc.dg/pr71969-2.c: New test. + * gcc.dg/pr71969-3.c: New test. + 2016-07-29 Marek Polacek PR c/71574 diff --git a/gcc/testsuite/gcc.dg/alias-11.c b/gcc/testsuite/gcc.dg/alias-11.c index 36175d7c25a..7629c6c7d1a 100644 --- a/gcc/testsuite/gcc.dg/alias-11.c +++ b/gcc/testsuite/gcc.dg/alias-11.c @@ -24,7 +24,7 @@ dw_cfi_node *cie_cfi_head; unsigned fde_table_in_use; dw_fde_node *fde_table; -__inline__ void +static __inline__ void add_cfi (dw_cfi_node **list_head, dw_cfi_node *cfi) { dw_cfi_node **p; @@ -35,7 +35,7 @@ add_cfi (dw_cfi_node **list_head, dw_cfi_node *cfi) *p = cfi; } -__inline__ struct dw_cfi_struct * +static __inline__ struct dw_cfi_struct * new_cfi (void) { dw_cfi_node *cfi = (dw_cfi_node *) malloc (sizeof (dw_cfi_node)); diff --git a/gcc/testsuite/gcc.dg/pr71969-1.c b/gcc/testsuite/gcc.dg/pr71969-1.c new file mode 100644 index 00000000000..a39b05ea9ed --- /dev/null +++ b/gcc/testsuite/gcc.dg/pr71969-1.c @@ -0,0 +1,37 @@ +/* PR c/71969 */ +/* { dg-do compile } */ +/* { dg-options "-std=gnu99 -fno-gnu89-inline -O2 -fdump-tree-einline-details" } */ + +volatile int v; +#define S v++; +#define S10 S S S S S S S S S S +#define S100 S10 S10 S10 S10 S10 S10 S10 S10 S10 S10 + +extern inline void +foo (void) { S100 } + +inline void +bar (void) { S100 } + +static inline void +baz (void) { S100 } + +int +main () +{ + foo (); + foo (); + foo (); + foo (); + bar (); + bar (); + bar (); + bar (); + baz (); + baz (); + baz (); + baz (); + return 0; +} + +/* { dg-final { scan-tree-dump-times "will not early inline" 12 "einline" } } */ diff --git a/gcc/testsuite/gcc.dg/pr71969-2.c b/gcc/testsuite/gcc.dg/pr71969-2.c new file mode 100644 index 00000000000..f434fd0debd --- /dev/null +++ b/gcc/testsuite/gcc.dg/pr71969-2.c @@ -0,0 +1,23 @@ +/* PR c/71969 */ +/* { dg-do compile } */ +/* { dg-options "-std=gnu99 -fno-gnu89-inline -O2 -fdump-tree-einline-details" } */ + +volatile int v; +#define S v++; +#define S10 S S S S S S S S S S +#define S100 S10 S10 S10 S10 S10 S10 S10 S10 S10 S10 + +extern inline __attribute__((gnu_inline)) void +foo (void) { S100 } + +int +main () +{ + foo (); + foo (); + foo (); + foo (); + return 0; +} + +/* { dg-final { scan-tree-dump-times "Inlining foo into main" 4 "einline" } } */ diff --git a/gcc/testsuite/gcc.dg/pr71969-3.c b/gcc/testsuite/gcc.dg/pr71969-3.c new file mode 100644 index 00000000000..583d89d68da --- /dev/null +++ b/gcc/testsuite/gcc.dg/pr71969-3.c @@ -0,0 +1,38 @@ +/* PR c/71969 */ +/* { dg-do compile } */ +/* { dg-options "-std=gnu99 -fgnu89-inline -O2 -fdump-tree-einline-details" } */ + +volatile int v; +#define S v++; +#define S10 S S S S S S S S S S +#define S100 S10 S10 S10 S10 S10 S10 S10 S10 S10 S10 + +extern inline void +foo (void) { S100 } + +inline void +bar (void) { S100 } + +static inline void +baz (void) { S100 } + +int +main () +{ + foo (); + foo (); + foo (); + foo (); + bar (); + bar (); + bar (); + bar (); + baz (); + baz (); + baz (); + baz (); + return 0; +} + +/* { dg-final { scan-tree-dump-times "will not early inline" 8 "einline" } } */ +/* { dg-final { scan-tree-dump-times "Inlining foo into main" 4 "einline" } } */ -- 2.30.2