public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
From: Jason Merrill <jason@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org
Subject: [gcc r13-5313] c++: vector of class with bool ctor [PR108195]
Date: Mon, 23 Jan 2023 21:13:00 +0000 (GMT)	[thread overview]
Message-ID: <20230123211300.353253858C2B@sourceware.org> (raw)

https://gcc.gnu.org/g:72e46b3c7ad5e3d2c69868a510c00707c356106a

commit r13-5313-g72e46b3c7ad5e3d2c69868a510c00707c356106a
Author: Jason Merrill <jason@redhat.com>
Date:   Mon Jan 23 15:03:47 2023 -0500

    c++: vector of class with bool ctor [PR108195]
    
    The transformation done by r13-4564 to use the iterator constructor instead
    of the initializer-list constructor breaks if the iterator pointers are
    themselves treated as elements of an initializer-list, so check for that.
    
            PR c++/108195
    
    gcc/cp/ChangeLog:
    
            * call.cc (build_user_type_conversion_1): Check whether the
            iterators also find a list ctor.
    
    gcc/testsuite/ChangeLog:
    
            * g++.dg/cpp0x/initlist-vect2.C: New test.

Diff:
---
 gcc/cp/call.cc                              |  2 +-
 gcc/testsuite/g++.dg/cpp0x/initlist-vect2.C | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/gcc/cp/call.cc b/gcc/cp/call.cc
index a7de0e8e9a6..5715a7cd1de 100644
--- a/gcc/cp/call.cc
+++ b/gcc/cp/call.cc
@@ -4581,7 +4581,7 @@ build_user_type_conversion_1 (tree totype, tree expr, int flags,
   if (tree iters = maybe_init_list_as_range (cand->fn, expr))
     if (z_candidate *cand2
 	= build_user_type_conversion_1 (totype, iters, flags, tf_none))
-      if (cand2->viable == 1)
+      if (cand2->viable == 1 && !is_list_ctor (cand2->fn))
 	{
 	  cand = cand2;
 	  expr = iters;
diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist-vect2.C b/gcc/testsuite/g++.dg/cpp0x/initlist-vect2.C
new file mode 100644
index 00000000000..eec7d340fd1
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/initlist-vect2.C
@@ -0,0 +1,16 @@
+// PR c++/108195
+// { dg-do run { target c++11 } }
+
+#include <vector>
+
+struct S
+{
+  S(bool) {}
+};
+
+int main()
+{
+  std::vector<S> v = { true, false, true };
+  if (v.size() != 3)
+    __builtin_abort ();
+}

                 reply	other threads:[~2023-01-23 21:13 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=20230123211300.353253858C2B@sourceware.org \
    --to=jason@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: link
Be 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).