diff --git a/gcc/ChangeLog b/gcc/ChangeLog index a7dcc8ed6db7..01488bf8bf9b 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2009-04-19 Joseph Myers + + PR c/19771 + * c-semantics.c (pop_stmt_list): Propagate + STATEMENT_LIST_HAS_LABEL to parent statement list. + 2009-04-19 Adam Nemet * config/mips/mips.h (mips_tune_attr): New macro. diff --git a/gcc/c-semantics.c b/gcc/c-semantics.c index 3c7b241b999b..b6c3a27c5ab0 100644 --- a/gcc/c-semantics.c +++ b/gcc/c-semantics.c @@ -70,6 +70,8 @@ pop_stmt_list (tree t) { chain = TREE_CHAIN (u); TREE_CHAIN (u) = NULL_TREE; + if (chain) + STATEMENT_LIST_HAS_LABEL (chain) |= STATEMENT_LIST_HAS_LABEL (u); if (t == u) break; u = chain; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index fd41b3225e4e..a3e266be90a7 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2009-04-19 Joseph Myers + + PR c/19771 + * gcc.c-torture/execute/vla-dealloc-1.c: New test. + 2009-04-19 Joseph Myers PR c/38243 diff --git a/gcc/testsuite/gcc.c-torture/execute/vla-dealloc-1.c b/gcc/testsuite/gcc.c-torture/execute/vla-dealloc-1.c new file mode 100644 index 000000000000..f2291ad66d48 --- /dev/null +++ b/gcc/testsuite/gcc.c-torture/execute/vla-dealloc-1.c @@ -0,0 +1,22 @@ +/* VLAs should be deallocated on a jump to before their definition, + including a jump to a label in an inner scope. PR 19771. */ + +void *volatile p; + +int +main (void) +{ + int n = 0; + if (0) + { + lab:; + } + int x[n % 1000 + 1]; + x[0] = 1; + x[n % 1000] = 2; + p = x; + n++; + if (n < 1000000) + goto lab; + return 0; +}