diff options
| author | Patrick Palka <patrick@parcs.ath.cx> | 2014-04-05 02:35:54 +0700 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2014-04-04 15:35:54 -0400 |
| commit | 822cc906fd9341dd64f808f4553aaa07c8de8c6a (patch) | |
| tree | 925853c0f98fae1bd5d7cf1470e266bc747eebe8 /gcc/cp | |
| parent | 8fe91ca80ebe76ddc0f66674061209dd6a5e7557 (diff) | |
| download | gcc-822cc906fd9341dd64f808f4553aaa07c8de8c6a.zip gcc-822cc906fd9341dd64f808f4553aaa07c8de8c6a.tar.gz gcc-822cc906fd9341dd64f808f4553aaa07c8de8c6a.tar.bz2 | |
re PR c++/21113 (Jumps into VLA or VM scope not rejected for C++)
PR c++/21113
* decl.c (decl_jump_unsafe): Consider variably-modified decls.
From-SVN: r209124
Diffstat (limited to 'gcc/cp')
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/decl.c | 7 |
2 files changed, 8 insertions, 4 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index e095569..615db3f 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2014-04-04 Patrick Palka <patrick@parcs.ath.cx> + + PR c++/21113 + * decl.c (decl_jump_unsafe): Consider variably-modified decls. + 2014-04-04 Fabien Chêne <fabien@gcc.gnu.org> * class.c (find_abi_tags_r): Check for the return of warning diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index f1743dd..0d8ebcb 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -2785,12 +2785,11 @@ decl_jump_unsafe (tree decl) || type == error_mark_node) return 0; - type = strip_array_types (type); - - if (DECL_NONTRIVIALLY_INITIALIZED_P (decl)) + if (DECL_NONTRIVIALLY_INITIALIZED_P (decl) + || variably_modified_type_p (type, NULL_TREE)) return 2; - if (TYPE_HAS_NONTRIVIAL_DESTRUCTOR (TREE_TYPE (decl))) + if (TYPE_HAS_NONTRIVIAL_DESTRUCTOR (type)) return 1; return 0; |