aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorJonathan Wakely <jwakely@redhat.com>2022-09-27 09:51:10 +0100
committerJonathan Wakely <jwakely@redhat.com>2022-09-27 11:59:53 +0100
commit3f7eea4411e4b2d8a500d9272b2ed72f73bdd008 (patch)
treefc4f93a817acae7ac594f73b79031541d20aeaff /gcc
parent614e5696d730a65998ff5b0373f905795a758dd6 (diff)
downloadgcc-3f7eea4411e4b2d8a500d9272b2ed72f73bdd008.zip
gcc-3f7eea4411e4b2d8a500d9272b2ed72f73bdd008.tar.gz
gcc-3f7eea4411e4b2d8a500d9272b2ed72f73bdd008.tar.bz2
c++: Make __is_{,nothrow_}convertible SFINAE on access [PR107049]
The is_convertible built-ins should return false if the conversion fails an access check, not report an error. PR c++/107049 gcc/cp/ChangeLog: * method.cc (is_convertible_helper): Use access check sentinel. gcc/testsuite/ChangeLog: * g++.dg/ext/is_convertible4.C: New test. * g++.dg/ext/is_nothrow_convertible4.C: New test. libstdc++-v3/ChangeLog: * testsuite/20_util/is_convertible/requirements/access.cc: New test.
Diffstat (limited to 'gcc')
-rw-r--r--gcc/cp/method.cc1
-rw-r--r--gcc/testsuite/g++.dg/ext/is_convertible4.C33
-rw-r--r--gcc/testsuite/g++.dg/ext/is_nothrow_convertible4.C33
3 files changed, 67 insertions, 0 deletions
diff --git a/gcc/cp/method.cc b/gcc/cp/method.cc
index 9f917f1..55af5c4 100644
--- a/gcc/cp/method.cc
+++ b/gcc/cp/method.cc
@@ -2246,6 +2246,7 @@ is_convertible_helper (tree from, tree to)
return integer_one_node;
cp_unevaluated u;
tree expr = build_stub_object (from);
+ deferring_access_check_sentinel acs (dk_no_deferred);
return perform_implicit_conversion (to, expr, tf_none);
}
diff --git a/gcc/testsuite/g++.dg/ext/is_convertible4.C b/gcc/testsuite/g++.dg/ext/is_convertible4.C
new file mode 100644
index 0000000..8a7724c
--- /dev/null
+++ b/gcc/testsuite/g++.dg/ext/is_convertible4.C
@@ -0,0 +1,33 @@
+// PR c++/107049
+// { dg-do compile { target c++11 } }
+// Failed access check should be a substitution failure, not an error.
+
+template<bool B>
+struct bool_constant { static constexpr bool value = B; };
+
+template<typename From, typename To>
+struct is_convertible
+: public bool_constant<__is_convertible(From, To)>
+{ };
+
+#if __cpp_variable_templates
+template<typename From, typename To>
+constexpr bool is_convertible_v = __is_convertible(From, To);
+#endif
+
+class Private
+{
+ operator int() const
+ {
+ static_assert( not is_convertible<Private, int>::value, "" );
+#if __cpp_variable_templates
+ static_assert( not is_convertible_v<Private, int>, "" );
+#endif
+ return 0;
+ }
+};
+
+static_assert( not is_convertible<Private, int>::value, "" );
+#if __cpp_variable_templates
+static_assert( not is_convertible_v<Private, int>, "" );
+#endif
diff --git a/gcc/testsuite/g++.dg/ext/is_nothrow_convertible4.C b/gcc/testsuite/g++.dg/ext/is_nothrow_convertible4.C
new file mode 100644
index 0000000..f81b594
--- /dev/null
+++ b/gcc/testsuite/g++.dg/ext/is_nothrow_convertible4.C
@@ -0,0 +1,33 @@
+// PR c++/107049
+// { dg-do compile { target c++11 } }
+// Failed access check should be a substitution failure, not an error.
+
+template<bool B>
+struct bool_constant { static constexpr bool value = B; };
+
+template<typename From, typename To>
+struct is_nt_convertible
+: public bool_constant<__is_nothrow_convertible(From, To)>
+{ };
+
+#if __cpp_variable_templates
+template<typename From, typename To>
+constexpr bool is_nt_convertible_v = __is_nothrow_convertible(From, To);
+#endif
+
+class Private
+{
+ operator int() const
+ {
+ static_assert( not is_nt_convertible<Private, int>::value, "" );
+#if __cpp_variable_templates
+ static_assert( not is_nt_convertible_v<Private, int>, "" );
+#endif
+ return 0;
+ }
+};
+
+static_assert( not is_nt_convertible<Private, int>::value, "" );
+#if __cpp_variable_templates
+static_assert( not is_nt_convertible_v<Private, int>, "" );
+#endif