From cd14f8f21efcebb163f8775a138373460b0c06f1 Mon Sep 17 00:00:00 2001 From: paolo Date: Fri, 20 Nov 2009 16:03:19 +0000 Subject: [PATCH] cp/ 2009-11-20 Paolo Carlini PR c++/42060 * except.c (build_throw): Check the tree returned by decay_conversion for error_mark_node. testsuite/ 2009-11-20 Paolo Carlini PR c++/42060 * g++.dg/cpp0x/initlist28.C: New. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@154371 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/cp/ChangeLog | 6 ++++++ gcc/cp/except.c | 8 ++++++-- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/g++.dg/cpp0x/initlist28.C | 8 ++++++++ 4 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/g++.dg/cpp0x/initlist28.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index b5b2b04..a4024ef 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2009-11-20 Paolo Carlini + + PR c++/42060 + * except.c (build_throw): Check the tree returned by + decay_conversion for error_mark_node. + 2009-11-20 Shujing Zhao PR c++/29017 diff --git a/gcc/cp/except.c b/gcc/cp/except.c index 1b13819..66dc14e 100644 --- a/gcc/cp/except.c +++ b/gcc/cp/except.c @@ -752,8 +752,12 @@ build_throw (tree exp) } } else - exp = build2 (INIT_EXPR, temp_type, object, - decay_conversion (exp)); + { + tmp = decay_conversion (exp); + if (tmp == error_mark_node) + return error_mark_node; + exp = build2 (INIT_EXPR, temp_type, object, tmp); + } /* Pre-evaluate the thrown expression first, since if we allocated the space first we would have to deal with cleaning it up if diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 4cc2378..de7ab00 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2009-11-20 Paolo Carlini + + PR c++/42060 + * g++.dg/cpp0x/initlist28.C: New. + 2009-11-20 H.J. Lu * gfortran.dg/proc_ptr_comp_23.f90: Add a missing space. diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist28.C b/gcc/testsuite/g++.dg/cpp0x/initlist28.C new file mode 100644 index 0000000..3b959a0 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/initlist28.C @@ -0,0 +1,8 @@ +// PR c++/42060 +// { dg-options "-std=c++0x" } + +void foo() +{ + int a[1]; + throw a = {}; // { dg-error "invalid use of non-lvalue array" } +} -- 2.7.4