aboutsummaryrefslogtreecommitdiff
path: root/gcc/cp/method.c
diff options
context:
space:
mode:
authorVille Voutilainen <ville.voutilainen@gmail.com>2020-03-17 16:38:25 +0200
committerVille Voutilainen <ville.voutilainen@gmail.com>2020-03-17 17:03:18 +0200
commit887085be635101ae1fa16be8dcdbbe6b240b600b (patch)
tree97237c5675d93b4dcaa46e66a46aa1d463f32e77 /gcc/cp/method.c
parent4be8cf77026b6cdcf9ab9cff6e70a75ea4bfaded (diff)
downloadgcc-887085be635101ae1fa16be8dcdbbe6b240b600b.zip
gcc-887085be635101ae1fa16be8dcdbbe6b240b600b.tar.gz
gcc-887085be635101ae1fa16be8dcdbbe6b240b600b.tar.bz2
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.
Diffstat (limited to 'gcc/cp/method.c')
-rw-r--r--gcc/cp/method.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/gcc/cp/method.c b/gcc/cp/method.c
index f10cfec..c131fd4 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))))