OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR c++/49260 ([C++0x] lambda-eh2.C fails execution) 

PR c++/49260
	* call.c (build_call_a): Set cp_function_chain->can_throw here.
	(build_cxx_call): Not here.

From-SVN: r175296
This commit is contained in:
Jason Merrill 2011-06-22 11:55:22 -04:00 committed by Jason Merrill
parent 3b4c46d711
commit 8288cc7387
4 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/cp/ChangeLog
View File

@ -1,3 +1,9 @@
2011-06-22 Jason Merrill <jason@redhat.com>
PR c++/49260
* call.c (build_call_a): Set cp_function_chain->can_throw here.
(build_cxx_call): Not here.
2011-06-21 Jason Merrill <jason@redhat.com>
PR c++/49172

8
gcc/cp/call.c
View File

@ -352,6 +352,9 @@ build_call_a (tree function, int n, tree *argarray)
nothrow = ((decl && TREE_NOTHROW (decl))
|| TYPE_NOTHROW_P (TREE_TYPE (TREE_TYPE (function))));
if (!nothrow && cfun && cp_function_chain)
cp_function_chain->can_throw = 1;
if (decl && TREE_THIS_VOLATILE (decl) && cfun && cp_function_chain)
current_function_returns_abnormally = 1;
@ -6710,11 +6713,6 @@ build_cxx_call (tree fn, int nargs, tree *argarray)
/* If this call might throw an exception, note that fact. */
fndecl = get_callee_fndecl (fn);
if ((!fndecl || !TREE_NOTHROW (fndecl))
&& at_function_scope_p ()
&& cfun
&& cp_function_chain)
cp_function_chain->can_throw = 1;
/* Check that arguments to builtin functions match the expectations. */
if (fndecl

5
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2011-06-22 Jason Merrill <jason@redhat.com>
PR c++/49260
* g++.dg/cpp0x/lambda/lambda-eh2.C: Change options.
2011-06-22 Dmitry Plotnikov <dplotnikov@ispras.ru>
Dmitry Melnik <dm@ispras.ru>

3
gcc/testsuite/g++.dg/cpp0x/lambda/lambda-eh2.C
View File

@ -1,5 +1,6 @@
// PR c++/47263
// { dg-options -std=c++0x }
// PR c++/49260
// { dg-options "-std=c++0x -fno-asynchronous-unwind-tables -fno-dwarf2-cfi-asm" }
// { dg-do run }
#include <exception>