From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <jason@sourceware.org>
Received: by sourceware.org (Postfix, from userid 2122)
 id 875A73972017; Tue,  8 Jun 2021 17:29:08 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 875A73972017
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Type: text/plain; charset="utf-8"
From: Jason Merrill <jason@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org
Subject: [gcc r11-8526] c++: braced-list overload resolution [PR100963]
X-Act-Checkin: gcc
X-Git-Author: Jason Merrill <jason@redhat.com>
X-Git-Refname: refs/heads/releases/gcc-11
X-Git-Oldrev: 1c4471ecc737aff19221447e33a6110b88e64196
X-Git-Newrev: 5af06ce836d4d8d1654db3855db8b86a994faf49
Message-Id: <20210608172908.875A73972017@sourceware.org>
Date: Tue,  8 Jun 2021 17:29:08 +0000 (GMT)
X-BeenThere: gcc-cvs@gcc.gnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Gcc-cvs mailing list <gcc-cvs.gcc.gnu.org>
List-Unsubscribe: <https://gcc.gnu.org/mailman/options/gcc-cvs>,
 <mailto:gcc-cvs-request@gcc.gnu.org?subject=unsubscribe>
List-Archive: <https://gcc.gnu.org/pipermail/gcc-cvs/>
List-Help: <mailto:gcc-cvs-request@gcc.gnu.org?subject=help>
List-Subscribe: <https://gcc.gnu.org/mailman/listinfo/gcc-cvs>,
 <mailto:gcc-cvs-request@gcc.gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 08 Jun 2021 17:29:08 -0000

https://gcc.gnu.org/g:5af06ce836d4d8d1654db3855db8b86a994faf49

commit r11-8526-g5af06ce836d4d8d1654db3855db8b86a994faf49
Author: Jason Merrill <jason@redhat.com>
Date:   Tue Jun 8 09:19:58 2021 -0400

    c++: braced-list overload resolution [PR100963]
    
    My PR969626 patch made us ignore template candidates when there's a perfect
    non-template candidate.  In this case, we were considering B(int) a perfect
    match for B({0}), but the brace elision makes it imperfect.
    
            PR c++/100963
    
    gcc/cp/ChangeLog:
    
            * call.c (perfect_conversion_p): Check check_narrowing.
    
    gcc/testsuite/ChangeLog:
    
            * g++.dg/cpp0x/initlist124.C: New test.

Diff:
---
 gcc/cp/call.c                            |  3 +++
 gcc/testsuite/g++.dg/cpp0x/initlist124.C | 13 +++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/gcc/cp/call.c b/gcc/cp/call.c
index 4c4cb5d0491..4f1565dc68f 100644
--- a/gcc/cp/call.c
+++ b/gcc/cp/call.c
@@ -5878,6 +5878,9 @@ perfect_conversion_p (conversion *conv)
 			next_conversion (conv)->type))
 	return false;
     }
+  if (conv->check_narrowing)
+    /* Brace elision is imperfect.  */
+    return false;
   return true;
 }
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist124.C b/gcc/testsuite/g++.dg/cpp0x/initlist124.C
new file mode 100644
index 00000000000..45dcbb303e2
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/initlist124.C
@@ -0,0 +1,13 @@
+// PR c++/100963
+// { dg-do compile { target c++11 } }
+
+#include <initializer_list>
+
+struct B {
+  B(int) = delete;
+  template<class T> B(std::initializer_list<T>);
+};
+
+int main() {
+  B({0});
+}