From c6102b83256a6c637d359d60ab5f820043fc54b7 Mon Sep 17 00:00:00 2001 From: Richard Guenther Date: Tue, 20 Apr 2010 14:09:52 +0000 Subject: [PATCH] backport: re PR c/38957 (return of local variable pointer) 2010-04-20 Richard Guenther Backport from mainline 2009-01-24 Jakub Jelinek PR c/38957 * c-typeck.c (c_finish_return): Handle POINTER_PLUS_EXPR the same way as PLUS_EXPR. * gcc.dg/pr38957.c: New test. From-SVN: r158559 --- gcc/ChangeLog | 9 +++++++++ gcc/c-typeck.c | 1 + gcc/testsuite/ChangeLog | 8 ++++++++ gcc/testsuite/gcc.dg/pr38957.c | 16 ++++++++++++++++ 4 files changed, 34 insertions(+) create mode 100644 gcc/testsuite/gcc.dg/pr38957.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index d99458a3fc5a..177aba29feae 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,12 @@ +2010-04-20 Richard Guenther + + Backport from mainline + 2009-01-24 Jakub Jelinek + + PR c/38957 + * c-typeck.c (c_finish_return): Handle POINTER_PLUS_EXPR the same way + as PLUS_EXPR. + 2010-04-20 Richard Guenther Backport from mainline diff --git a/gcc/c-typeck.c b/gcc/c-typeck.c index 5b2b61d30652..e00de1fe430a 100644 --- a/gcc/c-typeck.c +++ b/gcc/c-typeck.c @@ -7136,6 +7136,7 @@ c_finish_return (tree retval) { case NOP_EXPR: case NON_LVALUE_EXPR: case CONVERT_EXPR: case PLUS_EXPR: + case POINTER_PLUS_EXPR: inner = TREE_OPERAND (inner, 0); continue; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index c9842fb3aea7..8002421e21e8 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,11 @@ +2010-04-20 Richard Guenther + + Backport from mainline + 2009-01-24 Jakub Jelinek + + PR c/38957 + * gcc.dg/pr38957.c: New test. + 2010-04-20 Richard Guenther Backport from mainline diff --git a/gcc/testsuite/gcc.dg/pr38957.c b/gcc/testsuite/gcc.dg/pr38957.c new file mode 100644 index 000000000000..f94cd7627b4a --- /dev/null +++ b/gcc/testsuite/gcc.dg/pr38957.c @@ -0,0 +1,16 @@ +/* PR c/38957 */ +/* { dg-do compile } */ + +char * +foo (void) +{ + char a[2]; + return a+1; /* { dg-warning "returns address of local variable" } */ +} + +char * +bar (void) +{ + char a[2]; + return a; /* { dg-warning "returns address of local variable" } */ +} -- 2.47.2