diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/ada/acats/norun.lst | 2 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/nested-func-2.c | 28 | ||||
| -rw-r--r-- | gcc/varasm.c | 6 |
5 files changed, 46 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index d148319..9e73321 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2005-01-14 Eric Botcazou <ebotcazou@libertysurf.fr> + + PR middle-end/18820 + * varasm.c (initializer_constant_valid_p) <ADDR_EXPR>: Return + zero for nested functions needing a static chain or functions + with a non-constant address. + 2005-01-13 Roger Sayle <roger@eyesopen.com> * simplify-rtx.c (simplify_binary_operation) <AND>: Optimize diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 90a14e2..62cda60 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2005-01-14 Eric Botcazou <ebotcazou@libertysurf.fr> + + * gcc.dg/nested-func-2.c: New test. + * ada/acats/norun.lst: Remove c953002. + 2005-01-12 Ulrich Weigand <uweigand@de.ibm.com> * gcc.dg/ftrapv-2.c (labsv): Call labs instead of abs. diff --git a/gcc/testsuite/ada/acats/norun.lst b/gcc/testsuite/ada/acats/norun.lst index 5d21693..049965b9 100644 --- a/gcc/testsuite/ada/acats/norun.lst +++ b/gcc/testsuite/ada/acats/norun.lst @@ -1,8 +1,6 @@ c380004 -c953002 cdd2a03 templat # Tests must be sorted in alphabetical order # c380004: should be front-end compile time error, PR ada/18817 -# c953002: often hanging, PR ada/18820 # cdd2a03: new Ada ruling not supported yet, PR ada/19323 diff --git a/gcc/testsuite/gcc.dg/nested-func-2.c b/gcc/testsuite/gcc.dg/nested-func-2.c new file mode 100644 index 0000000..14f14c6 --- /dev/null +++ b/gcc/testsuite/gcc.dg/nested-func-2.c @@ -0,0 +1,28 @@ +/* PR middle-end/18820 */ +/* Check that we reject nested functions as initializers + of static variables. */ + +/* { dg-do compile } */ +/* { dg-options "" } */ + +struct S { + void (*f)(int); +}; + +extern void baz(struct S *); +extern void p(int); + +void foo(void) +{ + int u; + + void bar(int val) + { + u = val; + } + + static struct S s = { bar }; /* { dg-error "(is not constant)|(near initialization)" } */ + + baz(&s); + p(u); +} diff --git a/gcc/varasm.c b/gcc/varasm.c index ba0aab5..8252f0e 100644 --- a/gcc/varasm.c +++ b/gcc/varasm.c @@ -3501,6 +3501,12 @@ initializer_constant_valid_p (tree value, tree endtype) && TREE_CODE (value) == INDIRECT_REF && TREE_CONSTANT (TREE_OPERAND (value, 0))) return null_pointer_node; + /* Taking the address of a nested function involves a trampoline. */ + if (value + && TREE_CODE (value) == FUNCTION_DECL + && ((decl_function_context (value) && !DECL_NO_STATIC_CHAIN (value)) + || DECL_NON_ADDR_CONST_P (value))) + return NULL_TREE; return value; case VIEW_CONVERT_EXPR: |