]> git.ipfire.org Git - thirdparty/gcc.git/commitdiff
c++: C++17 and decltype of multi-operator expression [PR95675]
authorJason Merrill <jason@redhat.com>
Wed, 3 Mar 2021 04:59:00 +0000 (23:59 -0500)
committerJason Merrill <jason@redhat.com>
Thu, 4 Mar 2021 01:29:05 +0000 (20:29 -0500)
A call that is the immediate operand of decltype has special semantics: no
temporary is produced, so it's OK for the return type to be e.g. incomplete.
But we were treating (e | f) the same way, which confused overload
resolution when we then tried to evaluate ... | g.

Fixed by making build_temp do what its name says, and force the C++17
temporary materialization conversion.

gcc/cp/ChangeLog:

PR c++/95675
* call.c (build_temp): Wrap a CALL_EXPR in a TARGET_EXPR
if it didn't get one before.

gcc/testsuite/ChangeLog:

PR c++/95675
* g++.dg/cpp0x/decltype-call5.C: New test.
* g++.dg/cpp0x/decltype-call6.C: New test.

gcc/cp/call.c
gcc/testsuite/g++.dg/cpp0x/decltype-call5.C [new file with mode: 0644]
gcc/testsuite/g++.dg/cpp0x/decltype-call6.C [new file with mode: 0644]

index b8b4ae676fac7b5eb8a83cc1ab2ba715fe93b4bd..7191a4945b1961e89c1ab7036407fc2018e9e82e 100644 (file)
@@ -6836,6 +6836,14 @@ build_temp (tree expr, tree type, int flags,
       && !type_has_nontrivial_copy_init (TREE_TYPE (expr)))
     return get_target_expr_sfinae (expr, complain);
 
+  /* In decltype, we might have decided not to wrap this call in a TARGET_EXPR.
+     But it turns out to be a subexpression, so perform temporary
+     materialization now.  */
+  if (TREE_CODE (expr) == CALL_EXPR
+      && CLASS_TYPE_P (type)
+      && same_type_ignoring_top_level_qualifiers_p (type, TREE_TYPE (expr)))
+    expr = build_cplus_new (type, expr, complain);
+
   savew = warningcount + werrorcount, savee = errorcount;
   args = make_tree_vector_single (expr);
   expr = build_special_member_call (NULL_TREE, complete_ctor_identifier,
diff --git a/gcc/testsuite/g++.dg/cpp0x/decltype-call5.C b/gcc/testsuite/g++.dg/cpp0x/decltype-call5.C
new file mode 100644 (file)
index 0000000..81ef6e6
--- /dev/null
@@ -0,0 +1,7 @@
+// PR c++/95675
+// { dg-do compile { target c++11 } }
+
+struct b {};
+b operator|(b, b) { return {}; }
+b e, f, g;
+using h = decltype(e | f | g);
diff --git a/gcc/testsuite/g++.dg/cpp0x/decltype-call6.C b/gcc/testsuite/g++.dg/cpp0x/decltype-call6.C
new file mode 100644 (file)
index 0000000..4173b60
--- /dev/null
@@ -0,0 +1,12 @@
+// PR c++/95675
+// { dg-do compile { target c++11 } }
+
+struct a {};
+template <typename> struct b;
+template <typename bq, typename br> struct b<bq(br)> {
+  decltype(bq()(br())) c;
+};
+struct e {
+  operator a();
+};
+b<e (*(e))(a)> d;