public inbox for gcc-cvs@sourceware.org help / color / mirror / Atom feed
From: Martin Liska <marxin@gcc.gnu.org> To: gcc-cvs@gcc.gnu.org Subject: [gcc(refs/users/marxin/heads/vect_cond_expr-rework-v3)] c++: Fix access checks for __is_assignable and __is_constructible Date: Thu, 19 Mar 2020 09:31:58 +0000 (GMT) [thread overview] Message-ID: <20200319093158.13BA7385E828@sourceware.org> (raw) https://gcc.gnu.org/g:887085be635101ae1fa16be8dcdbbe6b240b600b commit 887085be635101ae1fa16be8dcdbbe6b240b600b Author: Ville Voutilainen <ville.voutilainen@gmail.com> Date: Tue Mar 17 16:38:25 2020 +0200 c++: Fix access checks for __is_assignable and __is_constructible gcc/ PR c++/94197 * cp/method.c (assignable_expr): Use cp_unevaluated. (is_xible_helper): Push a non-deferred access check for the stub objects created by assignable_expr and constructible_expr. testsuite/ PR c++/94197 * g++.dg/ext/pr94197.C: New. Diff: --- gcc/cp/ChangeLog | 14 ++++++++ gcc/cp/method.c | 4 +-- gcc/testsuite/g++.dg/ext/pr94197.C | 74 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 90 insertions(+), 2 deletions(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 15b3ccc99be..d2c062aa3d8 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,17 @@ +2020-03-17 Ville Voutilainen <ville.voutilainen@gmail.com> + + gcc/ + + PR c++/94197 + * cp/method.c (assignable_expr): Use cp_unevaluated. + (is_xible_helper): Push a non-deferred access check for + the stub objects created by assignable_expr and constructible_expr. + + testsuite/ + + PR c++/94197 + * g++.dg/ext/pr94197.C: New. + 2020-03-17 Jakub Jelinek <jakub@redhat.com> * pt.c (tsubst): Fix up duplicated word issue in a diagnostic message. diff --git a/gcc/cp/method.c b/gcc/cp/method.c index f10cfecaae8..c131fd41536 100644 --- a/gcc/cp/method.c +++ b/gcc/cp/method.c @@ -1739,11 +1739,10 @@ check_nontriv (tree *tp, int *, void *) static tree assignable_expr (tree to, tree from) { - ++cp_unevaluated_operand; + cp_unevaluated cp_uneval_guard; to = build_stub_object (to); from = build_stub_object (from); tree r = cp_build_modify_expr (input_location, to, NOP_EXPR, from, tf_none); - --cp_unevaluated_operand; return r; } @@ -1806,6 +1805,7 @@ constructible_expr (tree to, tree from) static tree is_xible_helper (enum tree_code code, tree to, tree from, bool trivial) { + deferring_access_check_sentinel acs (dk_no_deferred); if (VOID_TYPE_P (to) || ABSTRACT_CLASS_TYPE_P (to) || (from && FUNC_OR_METHOD_TYPE_P (from) && (TYPE_READONLY (from) || FUNCTION_REF_QUALIFIED (from)))) diff --git a/gcc/testsuite/g++.dg/ext/pr94197.C b/gcc/testsuite/g++.dg/ext/pr94197.C new file mode 100644 index 00000000000..433a4616be2 --- /dev/null +++ b/gcc/testsuite/g++.dg/ext/pr94197.C @@ -0,0 +1,74 @@ +// { dg-do compile { target c++11 } } + +template<typename T> + T&& declval() noexcept; + +template<bool B> +struct bool_constant +{ + static constexpr bool value = B; + using type = bool_constant; +}; + +using true_type = bool_constant<true>; +using false_type = bool_constant<false>; + +template<bool, typename T, typename Arg> + struct __is_nt_constructible_impl + : public false_type + { }; + +template<typename T, typename Arg> + struct __is_nt_constructible_impl<true, T, Arg> + : public bool_constant<noexcept(static_cast<T>(declval<Arg>()))> + { }; + +template<typename T, typename Arg> + using __is_nothrow_constructible_impl + = __is_nt_constructible_impl<__is_constructible(T, Arg), T, Arg>; + +template<typename T> + struct __is_nothrow_copy_constructible_impl + : public __is_nothrow_constructible_impl<T, const T&> + { }; + +template<typename T> + struct is_nothrow_copy_constructible + : public __is_nothrow_copy_constructible_impl<T>::type + { }; + +template<bool, typename T, typename Arg> + struct __is_nt_assignable_impl + : public false_type + { }; + +template<typename T, typename Arg> + struct __is_nt_assignable_impl<true, T, Arg> + : public bool_constant<noexcept(declval<T&>() = declval<Arg>())> + { }; + +template<typename T, typename Arg> + using __is_nothrow_assignable_impl + = __is_nt_assignable_impl<__is_assignable(T, Arg), T, Arg>; + +template<typename T> + struct __is_nothrow_copy_assignable_impl + : public __is_nothrow_assignable_impl<T, const T&> + { }; + +template<typename T> + struct is_nothrow_copy_assignable + : public __is_nothrow_copy_assignable_impl<T>::type + { }; + +struct NType +{ + NType(); +private: + NType(const NType&); + NType& operator=(const NType&); +}; + + +static_assert( !is_nothrow_copy_constructible<NType>::value, "" ); +static_assert( !is_nothrow_copy_assignable<NType>::value, "" );
reply other threads:[~2020-03-19 9:31 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200319093158.13BA7385E828@sourceware.org \ --to=marxin@gcc.gnu.org \ --cc=gcc-cvs@gcc.gnu.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).