From patchwork Fri Sep 12 13:01:03 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nathaniel Shead X-Patchwork-Id: 120139 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 0561D3857BA5 for ; Fri, 12 Sep 2025 13:02:05 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0561D3857BA5 Authentication-Results: sourceware.org; dkim=pass (2048-bit key, unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=kELPF73/ X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-pl1-x631.google.com (mail-pl1-x631.google.com [IPv6:2607:f8b0:4864:20::631]) by sourceware.org (Postfix) with ESMTPS id 487473858031 for ; Fri, 12 Sep 2025 13:01:17 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 487473858031 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 487473858031 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::631 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1757682077; cv=none; b=ljye7V/KsZniMG5Z5S9x1+8U6mDlMTNK80M8dmpGe/x8f/noedFY56IMnGe6J9uLZ3vYvpChawM/59cMY2naxVifFH6dq1t6qiRshyXy+VH8o16skhiJioUUmau8Sn3etyUw4+u4v6jnAL3DmfZmNTITQ+CQPc9mXipjhmRLpa4= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1757682077; c=relaxed/simple; bh=zbnOlBThFX7IEx9PqhnsGadH8Ku9fRm+zVSLlvzMJiM=; h=DKIM-Signature:Date:From:To:Subject:Message-ID:MIME-Version; b=wWxxv5hhwJeth3slxfebH4WUDCdxmh8oUzeARTwgNt9mVtkrMRx7bX+ZU/ZAFTrVIeDqcYmgvRTa92lxKkE1jBDisfqfUKDh7uuy8Ekd8fv1u3hE4lAE7G9HBu4qlp5UFWPmoGiJeqsO9Z+LSHie1uwiuTGFoZfYtRy9qhvDCeQ= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 487473858031 Received: by mail-pl1-x631.google.com with SMTP id d9443c01a7336-24aacdf40a2so3556795ad.1 for ; Fri, 12 Sep 2025 06:01:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1757682076; x=1758286876; darn=gcc.gnu.org; h=content-disposition:mime-version:message-id:subject:cc:to:from:date :from:to:cc:subject:date:message-id:reply-to; bh=KXEvvF7wA3KuPGaa69tX7YjUsw5UxBp7XwY3G5x6bVY=; b=kELPF73/TiB9lSndIzcY5dsjJpRAqAVPTWroyUWulXl7TuFg3SgPAolweQMji9vaRp p6eb/S0YP9d29fqDz0wT91v5ZY4LWAwgZ46xAtcHG8dNxM21Fo9epiLh9Fka7RlWVY9A k/AH4QxgOeFtrZNxvFB07AUMTpwsDLK3sqm87J5+C4gV+MhJ36s/4tiiTFBc8BOfIjrQ PdTke3nLE7y2BuVY+hZauMWOJWxpR8bhiZkxiBd40NADnori29K/77oBLUzQJhu3tO+j 8IXYpVErAtHd7worNaxTwA5C0TS20gZQImY/N0XLwRkGLcWy8noAhlrrWb5ygGUVb/9a kO2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757682076; x=1758286876; h=content-disposition:mime-version:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=KXEvvF7wA3KuPGaa69tX7YjUsw5UxBp7XwY3G5x6bVY=; b=pgqYlvK5QlonEE1gDEemQbLB+nlc1ULyrsqh2M6YeXWmBWRI2u7lME2x/9Z//EEu1+ VfL0v8mzpxcvQcXapWBewW/pRASFLDE7zf2ofKduzaHHBD7UvxXpFXptkdB2jBliI5us /bRf10DgL8hwUetEI74Czu4s8gNY6q77qAcs8Cne+mQBaQz0gNnw7Co9ZXGBT29KZAHJ JQ9nPtZdF+vHg2BvLAZx270j72wP7e3N7yqZNLSeg8OkXiGpLAfsciEg1SsgXlrBxP+e mRU1zt0GOWuq7sPi2QEOVSqyKT32uBzbXcbFZ+dJoDGx638CUljCxZheKV574c6LZgqr UAqQ== X-Gm-Message-State: AOJu0YwZZeZ1X5Y0qQY3jX6SBsCjwrIYfO6eYqHPZbUNtl+gFq8hxuSA iwpzxBJbPDLm7mUyVtOztAvCr6GUpoEZQrbzbfFy2HPwvjvTkO/YlU61YOBteg== X-Gm-Gg: ASbGncsQ4dHLmN8WlJgUqGnwJz5wNThi5Ifp+fCMYPq/xB6Q7xLFIxUw4Dff/uWh6Dp SAkD534Y3YsR1g4LePvy6mOz004euFLb+CH78QgDnxj7TppX/8DXspX+x/So2CePKPMm1ubTTup YBqm6GbJhVCrYtJbcPYTPuU30ud6UYq6hQsiBDleRw4985wQ+YfxVA936cn1Pez4ZoeAdLwApBk vc6HKBIIOOR/NgZNVUDs9lcMUG7g+clXmLNEhO6Iw+AOBvXUY1/NUODY+cDPJkQmVhfbQ/nf9EE hcXZFyImXbxsF8ZltA8rufEv0u0iF51R9+v0dM4onXiw2X0OMJRp8UQAnCgU2xQi/uXs9lOIZ96 Lef7avGwEzeEPuRlC+NR6RUVSUiITl/g00WsYFjSONTVIl/TmMdZWIGv5BLoqLjhAOQ== X-Google-Smtp-Source: AGHT+IFolllQoiX5i6pOkCL9nBHbAwBTk+7iVasDQoOzuAELuXUSFxJmeKVHogDzhfZSxJQwH7QRSw== X-Received: by 2002:a17:902:fb10:b0:24c:e213:ca4a with SMTP id d9443c01a7336-25d246db35bmr12458955ad.2.1757682074464; Fri, 12 Sep 2025 06:01:14 -0700 (PDT) Received: from Thaum.localdomain ([203.189.4.77]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-25c3ad33e0asm48635105ad.110.2025.09.12.06.01.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Sep 2025 06:01:13 -0700 (PDT) Date: Fri, 12 Sep 2025 23:01:03 +1000 From: Nathaniel Shead To: gcc-patches@gcc.gnu.org Cc: Jason Merrill , Patrick Palka Subject: [PATCH] c++/modules: Fix missed unwrapping of STAT_HACK in ADL [PR121893] Message-ID: MIME-Version: 1.0 Content-Disposition: inline X-Spam-Status: No, score=-12.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces~patchwork=sourceware.org@gcc.gnu.org Bootstrapped and regtested on x86_64-pc-linux-gnu, OK for trunk? -- >8 -- My r16-3559-gc2e567a6edb563 reworked ADL for modules, including a change to allow seeing module-linkage declarations if they only exist on the instantiation path. This caused a crash however as I neglected to unwrap the stat hack wrapper when we were happy to see all declarations, allowing search_adl to add non-functions to the overload set. PR c++/121893 gcc/cp/ChangeLog: * name-lookup.cc (name_lookup::adl_namespace_fns): Unwrap the STAT_HACK also when on_inst_path. gcc/testsuite/ChangeLog: * g++.dg/modules/adl-10_a.C: New test. * g++.dg/modules/adl-10_b.C: New test. Signed-off-by: Nathaniel Shead --- gcc/cp/name-lookup.cc | 4 +++- gcc/testsuite/g++.dg/modules/adl-10_a.C | 23 +++++++++++++++++++++++ gcc/testsuite/g++.dg/modules/adl-10_b.C | 7 +++++++ 3 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/g++.dg/modules/adl-10_a.C create mode 100644 gcc/testsuite/g++.dg/modules/adl-10_b.C diff --git a/gcc/cp/name-lookup.cc b/gcc/cp/name-lookup.cc index 43b95bffecf..32af7a6aed9 100644 --- a/gcc/cp/name-lookup.cc +++ b/gcc/cp/name-lookup.cc @@ -1306,7 +1306,9 @@ name_lookup::adl_namespace_fns (tree scope, bitmap imports, /* For lookups on the instantiation path we can see any module-linkage declaration; otherwise we should only see exported decls. */ - if (!on_inst_path) + if (on_inst_path) + bind = STAT_DECL (bind); + else bind = STAT_VISIBLE (bind); } diff --git a/gcc/testsuite/g++.dg/modules/adl-10_a.C b/gcc/testsuite/g++.dg/modules/adl-10_a.C new file mode 100644 index 00000000000..eef4ef0f724 --- /dev/null +++ b/gcc/testsuite/g++.dg/modules/adl-10_a.C @@ -0,0 +1,23 @@ +// PR c++/121893 +// { dg-additional-options "-fmodules -Wno-global-module" } +// { dg-module-cmi M } + +module; +namespace ns { + struct S {}; + + struct F { + template void operator()(T) {} + }; + inline constexpr F foo{}; +} + +export module M; + +namespace ns { + export using ns::S; + export using ns::foo; +} + +template void foo(T) {} +export template void go(T t) { foo(t); } diff --git a/gcc/testsuite/g++.dg/modules/adl-10_b.C b/gcc/testsuite/g++.dg/modules/adl-10_b.C new file mode 100644 index 00000000000..9be64a96f4e --- /dev/null +++ b/gcc/testsuite/g++.dg/modules/adl-10_b.C @@ -0,0 +1,7 @@ +// PR c++/121893 +// { dg-additional-options "-fmodules" } + +import M; +int main() { + ::go(ns::S{}); +}