From 5321ffedee1b4e05b7fa56cab64c595516fd9533 Mon Sep 17 00:00:00 2001 From: jamborm Date: Mon, 14 Aug 2017 14:33:54 +0000 Subject: Merged trunk revision 251080 into the hsa branch git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/hsa@251093 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/cp/class.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gcc/cp/class.c') diff --git a/gcc/cp/class.c b/gcc/cp/class.c index 508570bdb04..94738bd8f78 100644 --- a/gcc/cp/class.c +++ b/gcc/cp/class.c @@ -8093,8 +8093,9 @@ resolve_address_of_overloaded_function (tree target_type, continue; /* In C++17 we need the noexcept-qualifier to compare types. */ - if (flag_noexcept_type) - maybe_instantiate_noexcept (fn); + if (flag_noexcept_type + && !maybe_instantiate_noexcept (fn, complain)) + continue; /* See if there's a match. */ tree fntype = static_fn_type (fn); @@ -8176,7 +8177,7 @@ resolve_address_of_overloaded_function (tree target_type, /* In C++17 we need the noexcept-qualifier to compare types. */ if (flag_noexcept_type) - maybe_instantiate_noexcept (instantiation); + maybe_instantiate_noexcept (instantiation, complain); /* See if there's a match. */ tree fntype = static_fn_type (instantiation); -- cgit v1.2.1