From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1888) id 6B92F3858C55; Thu, 29 Sep 2022 20:27:49 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6B92F3858C55 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1664483269; bh=XVRFL3MQskFlbqYvm4bucsP+ZmdX0GOF38JcILIm+Ag=; h=From:To:Subject:Date:From; b=Hwa3gMQB1a55QmSAfK/SZoFBqqe/NafPc2YnCvrrNeMiZpvbnPwc4ESMqNniCFI9m Wa8IZYqq4DKL8pIXJPxqxO5I3P7ocC/n8UKDxAMB6UBuqQHA02l8XM9AMh0qtFoaDN 5dnJTVLv87it2ydP1xER3qd1wDDXfSWYzmzBXvLY= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Patrick Palka To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-2969] c++: implicit lookup of std::initializer_list [PR102576] X-Act-Checkin: gcc X-Git-Author: Patrick Palka X-Git-Refname: refs/heads/master X-Git-Oldrev: 04d54b70fe2c3d69eb1d08f7212f01c8a972b701 X-Git-Newrev: c2ee70f20de8133a88553270073226b0f3f55f62 Message-Id: <20220929202749.6B92F3858C55@sourceware.org> Date: Thu, 29 Sep 2022 20:27:49 +0000 (GMT) List-Id: https://gcc.gnu.org/g:c2ee70f20de8133a88553270073226b0f3f55f62 commit r13-2969-gc2ee70f20de8133a88553270073226b0f3f55f62 Author: Patrick Palka Date: Thu Sep 29 16:27:30 2022 -0400 c++: implicit lookup of std::initializer_list [PR102576] Here the lookup for the implicit use of std::initializer_list fails because we do it using get_namespace_binding, which isn't import aware. Fix this by using lookup_qualified_name instead. PR c++/102576 gcc/cp/ChangeLog: * pt.cc (listify): Use lookup_qualified_name instead of get_namespace_binding. gcc/testsuite/ChangeLog: * g++.dg/modules/pr102576_a.H: New test. * g++.dg/modules/pr102576_b.C: New test. Diff: --- gcc/cp/pt.cc | 5 +++-- gcc/testsuite/g++.dg/modules/pr102576_a.H | 5 +++++ gcc/testsuite/g++.dg/modules/pr102576_b.C | 9 +++++++++ 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/gcc/cp/pt.cc b/gcc/cp/pt.cc index 0f92374f19a..258f76d6e47 100644 --- a/gcc/cp/pt.cc +++ b/gcc/cp/pt.cc @@ -29161,9 +29161,10 @@ finish_concept_definition (cp_expr id, tree init) static tree listify (tree arg) { - tree std_init_list = get_namespace_binding (std_node, init_list_identifier); + tree std_init_list = lookup_qualified_name (std_node, init_list_identifier); - if (!std_init_list || !DECL_CLASS_TEMPLATE_P (std_init_list)) + if (std_init_list == error_mark_node + || !DECL_CLASS_TEMPLATE_P (std_init_list)) { gcc_rich_location richloc (input_location); maybe_add_include_fixit (&richloc, "", false); diff --git a/gcc/testsuite/g++.dg/modules/pr102576_a.H b/gcc/testsuite/g++.dg/modules/pr102576_a.H new file mode 100644 index 00000000000..87ba9b52031 --- /dev/null +++ b/gcc/testsuite/g++.dg/modules/pr102576_a.H @@ -0,0 +1,5 @@ +// PR c++/102576 +// { dg-additional-options -fmodule-header } +// { dg-module-cmi {} } + +#include diff --git a/gcc/testsuite/g++.dg/modules/pr102576_b.C b/gcc/testsuite/g++.dg/modules/pr102576_b.C new file mode 100644 index 00000000000..10251ed5304 --- /dev/null +++ b/gcc/testsuite/g++.dg/modules/pr102576_b.C @@ -0,0 +1,9 @@ +// PR c++/102576 +// { dg-additional-options -fmodules-ts } + +import "pr102576_a.H"; + +int main() { + for (int i : {1, 2, 3}) + ; +}