From patchwork Fri Oct 4 00:52:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nathaniel Shead X-Patchwork-Id: 1992574 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=gYFO3iIw; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4XKVSL22cGz1xt7 for ; Fri, 4 Oct 2024 10:54:40 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 8657D384642D for ; Fri, 4 Oct 2024 00:54:37 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-pj1-x102c.google.com (mail-pj1-x102c.google.com [IPv6:2607:f8b0:4864:20::102c]) by sourceware.org (Postfix) with ESMTPS id EAB163842586 for ; Fri, 4 Oct 2024 00:52:14 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org EAB163842586 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 EAB163842586 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::102c ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1728003146; cv=none; b=DW3pjVyPiruyg5tJ3awqlnaK51L/urqzZafysxlTEByRsrY55hnPh8MrXUwjkK91ueOnuhoe2eeCfdOlicQrWocZAiLyAtsHuoPFHkD0FSIpk1T/yZrxlvvmS+FZWNzlcrLDFtMahqeS8YBiUOSrD6BSncGCjULsFpJboGXlveE= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1728003146; c=relaxed/simple; bh=Ni40uYgiaJehiZ0mYxqVRqjIktBe8YliIuPyKmj66v4=; h=DKIM-Signature:Message-ID:Date:From:To:Subject:MIME-Version; b=oW919AcsmtIEEI6glhJuwXZ6XfwhCamsPLJex4ZDiWeVSRkg+q5B0yruNcHKAao8mxTEBjNguyS5cgWhQW1/X4zSRt4IKdx5XxH5nx3LBrDlDHkK0jSNTu5oaHx/1rjoPgXOoIJCNwG/yPJfukX1+xzUzqv1K6osiqEJa/DZDTc= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-pj1-x102c.google.com with SMTP id 98e67ed59e1d1-2e19df65beeso214287a91.0 for ; Thu, 03 Oct 2024 17:52:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1728003133; x=1728607933; darn=gcc.gnu.org; h=content-disposition:mime-version:subject:cc:to:from:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=+wcZLbssXBA7aqw0XyFbqD1yHEyIJwGWj/Ysfwq1YJM=; b=gYFO3iIwhE+zOA3E0YIaCW8Ugl3acYkiHEoc561XtQkwVEBkjyFXH4AOd5McJsud73 M8eh18TGTNwjXvSVVqrCPJre8CX5H+yXrSKLWAJ2E0MTaWhafSeMy1+srphEMLoLko7W hNGkuwfciieEySSeYmAdsL7UyWg0muQ4RQBgl+3h6fTeK25sPcr5hioInz0SLUtHNC5s WFjr1bCidav7U+sB8QlVf3NUqXCmSJ5Ga2Iu3Fao/G/TMVBYfRssNWyOPjsXyUHyaY5p 6cuGDgTJHuQ9azH/Yp/EpwAxjKagVxV0usnVkNu2BvYzMRhcKwtaTsJNTcjNBhBY3ae2 XxiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728003133; x=1728607933; h=content-disposition:mime-version:subject:cc:to:from:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=+wcZLbssXBA7aqw0XyFbqD1yHEyIJwGWj/Ysfwq1YJM=; b=SMU7Cn606a+1jRGlqPv0TuWFIWyFHoRoK14bXb1NmY+VlDAzVsO4oI5bPIDWdN9aqZ hm6ODJpNeSXIjb2oQp72/FBwHU7nhkODqVql8HLnlRxeoHALtlmz+6qGWjsVTesUyu6X bj2w9z0mvfyiLw/qHhAoXLQDG7mtkMiwkv67inSyMdRZwtGVrcItlpStk+AcI01Uvt60 elGCotBVw5LRMCROTOY8GNVLd8vka96/hW2APhm98DJqGf1gWxW+QDmWevUFOZlw2fJ3 MyEeKGfJIkNBSqSXyZFvKvIoer9rgje7kPiWgINXh1JRRfVUn2BZTbrjQBXy2osVznaK CBuA== X-Gm-Message-State: AOJu0YwlNuNaGM4SQv4uREOm6FgiZkAx/u+dqSyjz00m1b3NatHtpIJB l9wAscbZM8XcARz1DpN3BfDTKbdPphboj9FJH+J+S1tTFZWeUHubH8INoA== X-Google-Smtp-Source: AGHT+IGvwHBOKdFocdDTWuOXilmrXFF1y9zKufUg6L/ZKpTmL6yh1u92iHoYyIIui29iTMBis1kzRg== X-Received: by 2002:a17:903:2305:b0:20b:9224:11a8 with SMTP id d9443c01a7336-20bff073a28mr5716695ad.11.1728003132984; Thu, 03 Oct 2024 17:52:12 -0700 (PDT) Received: from Thaum. ([163.47.68.2]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2e1e85d350dsm174041a91.22.2024.10.03.17.52.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Oct 2024 17:52:12 -0700 (PDT) Message-ID: <66ff3c3c.170a0220.d0b60.09ab@mx.google.com> X-Google-Original-Message-ID: Date: Fri, 4 Oct 2024 10:52:02 +1000 From: Nathaniel Shead To: gcc-patches@gcc.gnu.org Cc: Jason Merrill Subject: [PATCH] c++: Return the underlying decl rather than the USING_DECL from update_binding [PR116913] MIME-Version: 1.0 Content-Disposition: inline X-Spam-Status: No, score=-11.9 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~incoming=patchwork.ozlabs.org@gcc.gnu.org Tested on x86_64-pc-linux-gnu (so far just dg.exp), OK for trunk if full bootstrap + regtest passes? -- >8 -- Users of pushdecl assume that the returned decl will be a possibly updated decl matching the one that was passed in. My r15-3910 change broke this since in some cases we would now return USING_DECLs; this patch fixes the situation. PR c++/116913 gcc/cp/ChangeLog: * name-lookup.cc (update_binding): Return the strip_using'd old decl rather than the binding. gcc/testsuite/ChangeLog: * g++.dg/lookup/using70.C: New test. Signed-off-by: Nathaniel Shead --- gcc/cp/name-lookup.cc | 4 ++-- gcc/testsuite/g++.dg/lookup/using70.C | 13 +++++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/g++.dg/lookup/using70.C diff --git a/gcc/cp/name-lookup.cc b/gcc/cp/name-lookup.cc index 4754ef5a522..609bd6e8c9b 100644 --- a/gcc/cp/name-lookup.cc +++ b/gcc/cp/name-lookup.cc @@ -3101,7 +3101,7 @@ update_binding (cp_binding_level *level, cxx_binding *binding, tree *slot, { if (same_type_p (TREE_TYPE (old), TREE_TYPE (decl))) /* Two type decls to the same type. Do nothing. */ - return old_bval; + return old; else goto conflict; } @@ -3114,7 +3114,7 @@ update_binding (cp_binding_level *level, cxx_binding *binding, tree *slot, /* The new one must be an alias at this point. */ gcc_assert (DECL_NAMESPACE_ALIAS (decl)); - return old_bval; + return old; } else if (TREE_CODE (old) == VAR_DECL) { diff --git a/gcc/testsuite/g++.dg/lookup/using70.C b/gcc/testsuite/g++.dg/lookup/using70.C new file mode 100644 index 00000000000..14838eea7ec --- /dev/null +++ b/gcc/testsuite/g++.dg/lookup/using70.C @@ -0,0 +1,13 @@ +// PR c++/116913 +// { dg-do compile { target c++11 } } + +namespace ns { + struct c {}; + using d = int; +} + +using ns::c; +using ns::d; + +using c = ns::c; +using d = ns::d;