diff options
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/call.c | 11 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/other/pr94326.C | 19 |
4 files changed, 34 insertions, 4 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 46208b2..5b8c5e3 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,10 @@ 2020-03-27 Jakub Jelinek <jakub@redhat.com> + PR c++/94326 + * call.c (set_flags_from_callee): Don't update + cp_function_chain->can_throw or current_function_returns_abnormally + if cp_unevaluated_operand. + PR c++/94339 * cvt.c (ocp_convert): Handle COMPOUND_EXPR by recursion on the second operand and creating a new COMPOUND_EXPR if anything changed. diff --git a/gcc/cp/call.c b/gcc/cp/call.c index bae4b2c..02220ff 100644 --- a/gcc/cp/call.c +++ b/gcc/cp/call.c @@ -333,11 +333,14 @@ set_flags_from_callee (tree call) && internal_fn_flags (CALL_EXPR_IFN (call)) & ECF_NOTHROW) nothrow = true; - if (!nothrow && at_function_scope_p () && cfun && cp_function_chain) - cp_function_chain->can_throw = 1; + if (cfun && cp_function_chain && !cp_unevaluated_operand) + { + if (!nothrow && at_function_scope_p ()) + cp_function_chain->can_throw = 1; - if (decl && TREE_THIS_VOLATILE (decl) && cfun && cp_function_chain) - current_function_returns_abnormally = 1; + if (decl && TREE_THIS_VOLATILE (decl)) + current_function_returns_abnormally = 1; + } TREE_NOTHROW (call) = nothrow; } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index f0b1b5f..5f9b164 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,8 @@ 2020-03-27 Jakub Jelinek <jakub@redhat.com> + PR c++/94326 + * g++.dg/other/pr94326.C: New test. + PR c++/94339 * g++.dg/other/pr94339.C: New test. * g++.dg/ext/attr-copy-2.C: Comment out failing tests due to PR94346. diff --git a/gcc/testsuite/g++.dg/other/pr94326.C b/gcc/testsuite/g++.dg/other/pr94326.C new file mode 100644 index 0000000..4069c03 --- /dev/null +++ b/gcc/testsuite/g++.dg/other/pr94326.C @@ -0,0 +1,19 @@ +// PR c++/94326 +// { dg-do compile { target c++11 } } +// { dg-options "-fcompare-debug" } + +template <typename = int> struct A { + const int &foo() { return 0; } // { dg-warning "returning reference to temporary" } + template <typename _Kt> void bar(_Kt) { foo(); } +}; +struct B { + A<> b; + template <typename _Kt> auto baz(_Kt p1) -> decltype(b.bar(p1)) { + b.bar(p1); + } +}; +struct C {}; +void operator<(C, int) { + B a; + a.baz(C{}); +} |