From 09643d7e64cae41ab4984d267e94875b94ba960b Mon Sep 17 00:00:00 2001 From: unknown author <cooker@mandrivalinux.org> Date: Tue, 10 Feb 2009 15:47:48 +0000 Subject: gcc43 pr33763 2007-11-06 Jakub Jelinek <jakub@redhat.com> PR tree-optimization/33763 * gcc.dg/pr33763.c: New test. * g++.dg/opt/inline13.C: New test. 2007-11-06 Jan Hubicka <jh@suse.cz> PR tree-optimization/33763 * tree-inline.c (expand_call_inline): Silently ignore always_inline attribute for redefined extern inline functions. --- gcc/testsuite/g++.dg/opt/inline13.C | 60 +++++++++++++++++++++++++++++++++++ gcc/testsuite/gcc.dg/pr33763.c | 60 +++++++++++++++++++++++++++++++++++ gcc/tree-inline.c | 6 +++ 3 files changed, 126 insertions(+), 0 deletions(-) create mode 100644 gcc/testsuite/g++.dg/opt/inline13.C create mode 100644 gcc/testsuite/gcc.dg/pr33763.c diff --git a/gcc/testsuite/g++.dg/opt/inline13.C b/gcc/testsuite/g++.dg/opt/inline13.C new file mode 100644 index 0000000..43f562e --- /dev/null +++ b/gcc/testsuite/g++.dg/opt/inline13.C @@ -0,0 +1,60 @@ +// PR tree-optimization/33763 +// { dg-do compile } +// { dg-options "-O2" } + +typedef struct +{ + void *a; + void *b; +} T; +extern void *foo (const char *, const char *); +extern void *bar (void *, const char *, T); +extern int baz (const char *, int); + +extern inline __attribute__ ((always_inline, gnu_inline)) int +baz (const char *x, int y) +{ + return 2; +} + +int +baz (const char *x, int y) +{ + return 1; +} + +int xa, xb; + +static void * +inl (const char *x, const char *y) +{ + T t = { &xa, &xb }; + int *f = (int *) __builtin_malloc (sizeof (int)); + const char *z; + int o = 0; + void *r = 0; + + for (z = y; *z; z++) + { + if (*z == 'r') + o |= 1; + if (*z == 'w') + o |= 2; + } + if (o == 1) + *f = baz (x, 0); + if (o == 2) + *f = baz (x, 1); + if (o == 3) + *f = baz (x, 2); + + if (o && *f > 0) + r = bar (f, "w", t); + return r; +} + +void * +foo (const char *x, const char *y) +{ + return inl (x, y); +} diff --git a/gcc/testsuite/gcc.dg/pr33763.c b/gcc/testsuite/gcc.dg/pr33763.c new file mode 100644 index 0000000..dbdfa77 --- /dev/null +++ b/gcc/testsuite/gcc.dg/pr33763.c @@ -0,0 +1,60 @@ +/* PR tree-optimization/33763 */ +/* { dg-do compile } */ +/* { dg-options "-O2" } */ + +typedef struct +{ + void *a; + void *b; +} T; +extern void *foo (const char *, const char *); +extern void *bar (void *, const char *, T); +extern int baz (const char *, int); + +extern inline __attribute__ ((always_inline, gnu_inline)) int +baz (const char *x, int y) +{ + return 2; +} + +int +baz (const char *x, int y) +{ + return 1; +} + +int xa, xb; + +static void * +inl (const char *x, const char *y) +{ + T t = { &xa, &xb }; + int *f = (int *) __builtin_malloc (sizeof (int)); + const char *z; + int o = 0; + void *r = 0; + + for (z = y; *z; z++) + { + if (*z == 'r') + o |= 1; + if (*z == 'w') + o |= 2; + } + if (o == 1) + *f = baz (x, 0); + if (o == 2) + *f = baz (x, 1); + if (o == 3) + *f = baz (x, 2); + + if (o && *f > 0) + r = bar (f, "w", t); + return r; +} + +void * +foo (const char *x, const char *y) +{ + return inl (x, y); +} diff --git a/gcc/tree-inline.c b/gcc/tree-inline.c index 15419c3..5111787 100644 --- a/gcc/tree-inline.c +++ b/gcc/tree-inline.c @@ -3238,6 +3238,12 @@ expand_call_inline (basic_block bb, gimple stmt, copy_body_data *id) goto egress; if (lookup_attribute ("always_inline", DECL_ATTRIBUTES (fn)) + /* For extern inline functions that get redefined we always + silently ignored alway_inline flag. Better behaviour would + be to be able to keep both bodies and use extern inline body + for inlining, but we can't do that because frontends overwrite + the body. */ + && !cg_edge->callee->local.redefined_extern_inline /* Avoid warnings during early inline pass. */ && cgraph_global_info_ready) { -- 1.6.2.4