aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Merrill <jason@redhat.com>2022-04-13 14:49:04 -0400
committerJason Merrill <jason@redhat.com>2022-04-13 20:24:01 -0400
commitd4e00ccef6c706a4a4a6446bffaf4111f98d5771 (patch)
tree22dfb36c5ec6fc6610ee1871800373cbe8e2b9dd
parentad8161e6d7b26d690d90069ae9a129e7ac36892a (diff)
downloadgcc-d4e00ccef6c706a4a4a6446bffaf4111f98d5771.zip
gcc-d4e00ccef6c706a4a4a6446bffaf4111f98d5771.tar.gz
gcc-d4e00ccef6c706a4a4a6446bffaf4111f98d5771.tar.bz2
c++: template conversion op [PR101698]
Asking for conversion to a dependent type also makes a BASELINK dependent. PR c++/101698 gcc/cp/ChangeLog: * pt.cc (tsubst_baselink): Also check dependent optype. gcc/testsuite/ChangeLog: * g++.dg/template/conv19.C: New test.
-rw-r--r--gcc/cp/pt.cc3
-rw-r--r--gcc/testsuite/g++.dg/template/conv19.C34
2 files changed, 36 insertions, 1 deletions
diff --git a/gcc/cp/pt.cc b/gcc/cp/pt.cc
index 84712e6..63c0870 100644
--- a/gcc/cp/pt.cc
+++ b/gcc/cp/pt.cc
@@ -16470,7 +16470,8 @@ tsubst_baselink (tree baselink, tree object_type,
tree binfo_type = BINFO_TYPE (BASELINK_BINFO (baselink));
binfo_type = tsubst (binfo_type, args, complain, in_decl);
- bool dependent_p = binfo_type != BINFO_TYPE (BASELINK_BINFO (baselink));
+ bool dependent_p = (binfo_type != BINFO_TYPE (BASELINK_BINFO (baselink))
+ || optype != BASELINK_OPTYPE (baselink));
if (dependent_p)
{
diff --git a/gcc/testsuite/g++.dg/template/conv19.C b/gcc/testsuite/g++.dg/template/conv19.C
new file mode 100644
index 0000000..7a3da93
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/conv19.C
@@ -0,0 +1,34 @@
+// PR c++/101698
+// { dg-do compile { target c++11 } }
+
+class Base {
+ public:
+ template <class T>
+ operator const T&() const = delete;
+
+ virtual operator const int&() const {
+ static int res;
+ return res;
+ }
+};
+
+template <class T>
+class Derive : public Base {
+ public:
+ operator const T&() const override {
+ using Y = int;
+ //static_assert(__is_same_as(T,Y), "");
+
+ static int res;
+
+ res = Base::operator const Y&(); // OK
+ res = Base::operator const T&(); // { dg-bogus "deleted" }
+ return res;
+ }
+};
+
+int main() {
+ Derive<int> a;
+ const int& b = a;
+ (void)b;
+}