From patchwork Tue Dec 12 21:21:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Palka X-Patchwork-Id: 1875374 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=Sd80Vryq; 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 4SqWlg2Qd0z1ySd for ; Wed, 13 Dec 2023 08:22:04 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id B8B2A3857711 for ; Tue, 12 Dec 2023 21:22:01 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id 0771E3858C78 for ; Tue, 12 Dec 2023 21:21:51 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 0771E3858C78 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 0771E3858C78 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1702416112; cv=none; b=BkoQ3uUBLGYeMHPEYJtmsr+dRoZJa0vCbix/NG+Nlntf0M5ZiO3mfhsYuvnO6LG15tGZfWyk5fuWCVqUd11oA24c+utW8zbO5sDujLzrRnouz0t7rhGSRvOeI2OjBXQm8rvN7ZeWjS1vLpg+UJhb27TVPs+tfroPuP0K8no3mG8= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1702416112; c=relaxed/simple; bh=XOKVggKWjE6RT1fbUwsjS+mQ4WUBrxJeOf0ww7vB8po=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=JtnhK05ILRhCZetahclpCB+hHhkQ05ZtEuEcseztq+NIZng29zNuFLpXeZX4HdAkVtuz0gs258LVclmZKDy2lPbDAgLSHvR2IB23DENiixd9gfTSjhBRiSGVnGDiWCBU8+Vpi9dg7EnalZrxpLgGyPSNDnb+Q+5EzEMHP7woFYE= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1702416110; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZLy/jYWpKyBkFUn2X/D9sJzf4fukgcjFeFVzdAum+AQ=; b=Sd80VryqwL7xi9d2/Z5jRoPh0/NQU6sBDnhbNHaZcMPlHqxvcUTkjDMRGsagPB25bK3BVQ k7G7RWVckUmUwCclR8CNmCnFma85yyR17CwHVVjHkAyTb2jnhKXSUZ/agtMlKt56qCj3pl YjmROXwX9By/zBLu1XazpliYkvtDAds= Received: from mail-qv1-f71.google.com (mail-qv1-f71.google.com [209.85.219.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-91-2m7XdQ3mOsqEfRXjObyq_A-1; Tue, 12 Dec 2023 16:21:49 -0500 X-MC-Unique: 2m7XdQ3mOsqEfRXjObyq_A-1 Received: by mail-qv1-f71.google.com with SMTP id 6a1803df08f44-67ef53b1f17so1905066d6.3 for ; Tue, 12 Dec 2023 13:21:49 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702416107; x=1703020907; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=ZLy/jYWpKyBkFUn2X/D9sJzf4fukgcjFeFVzdAum+AQ=; b=TkOjS2vtLGVkrYzCZAw/yUQwr1ttTMqUHPIReDWyahdIAnji/FMc3ZR3Onp3B0h8Ui xBXu53uMmHmW6e/3jFpvDDB003k2CP6VLQYLY/17s2cfncmdTfzi4aVKgSbZVxTuvXRI kwXqzQdKhEDi8yX+zyzf/aF9PMZlMaeQSq+uMnlrAk5hPO5QxtR4WifKObZ1anGx5tL3 FJuvpETjFjDekmMzHhAFcWnJws5jHo11xIOs93sdXbh/gyDXyWPUMFCBp68gAUgLKNP6 xGu0xIGcUr1cUb/h+luORzg9tYLG3jpN+ikFtiahdP0a96Ux7nBN/uyHN0txi214xDmB g5AQ== X-Gm-Message-State: AOJu0Yw0GvAr97pQ1TwESF8VcfPw8A8zfBScUJuW/69x+uAb6C7E5KuT YvKWkmf0+0/gnpjjT2GGr6bBtbovaXiJm/vpEqy0qtlEd2LfEYRi27eOFGCBjpSxaFcd8Ilx7mc qK3pwSnBFxFXNjAqrpQ8E4xZjQl3YX/a/XJGS+5U9K/MP4JHUOZxred1dn7Gahu7cHFJxW/XD7h k= X-Received: by 2002:a05:622a:288:b0:425:4043:50d2 with SMTP id z8-20020a05622a028800b00425404350d2mr9828879qtw.97.1702416107181; Tue, 12 Dec 2023 13:21:47 -0800 (PST) X-Google-Smtp-Source: AGHT+IEcCTu9ymL+/VZyyLRq9yiPrNbPEo3ADAVsHUVmgc9MczqrzlP0+ZPaWupbw3s9bUSSCfVCZw== X-Received: by 2002:a05:622a:288:b0:425:4043:50d2 with SMTP id z8-20020a05622a028800b00425404350d2mr9828866qtw.97.1702416106846; Tue, 12 Dec 2023 13:21:46 -0800 (PST) Received: from localhost.localdomain (ool-457670bb.dyn.optonline.net. [69.118.112.187]) by smtp.gmail.com with ESMTPSA id e7-20020ac845c7000000b00418122186ccsm4362201qto.12.2023.12.12.13.21.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Dec 2023 13:21:46 -0800 (PST) From: Patrick Palka To: gcc-patches@gcc.gnu.org Cc: jason@redhat.com, Patrick Palka Subject: [PATCH] c++: unifying constants vs their type [PR99186, PR104867] Date: Tue, 12 Dec 2023 16:21:43 -0500 Message-ID: <20231212212143.64983-1-ppalka@redhat.com> X-Mailer: git-send-email 2.43.0.76.g1a87c842ec MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.9 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, RCVD_IN_SORBS_WEB, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE 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 Bootstrapped and regtested on x86_64-pc-linux-gnu, does this look OK for trunk? -- >8 -- When unifying constants we need to generally treat constants of different types but same value as different, in light of auto template parameters. This patch fixes this in a minimal way; it seems we could get away with just using template_args_equal here, as we do in the default case, but that's a simplification we could look into during next stage 1. PR c++/99186 PR c++/104867 gcc/cp/ChangeLog: * pt.cc (unify) : Compare types as well. gcc/testsuite/ChangeLog: * g++.dg/cpp1z/nontype-auto23.C: New test. * g++.dg/cpp1z/nontype-auto24.C: New test. --- gcc/cp/pt.cc | 2 ++ gcc/testsuite/g++.dg/cpp1z/nontype-auto23.C | 23 +++++++++++++++++++++ gcc/testsuite/g++.dg/cpp1z/nontype-auto24.C | 18 ++++++++++++++++ 3 files changed, 43 insertions(+) create mode 100644 gcc/testsuite/g++.dg/cpp1z/nontype-auto23.C create mode 100644 gcc/testsuite/g++.dg/cpp1z/nontype-auto24.C diff --git a/gcc/cp/pt.cc b/gcc/cp/pt.cc index a8966e223f1..602dd02d29d 100644 --- a/gcc/cp/pt.cc +++ b/gcc/cp/pt.cc @@ -24709,6 +24709,8 @@ unify (tree tparms, tree targs, tree parm, tree arg, int strict, /* Type INTEGER_CST can come from ordinary constant template args. */ case INTEGER_CST: case REAL_CST: + if (!same_type_p (TREE_TYPE (parm), TREE_TYPE (arg))) + return unify_template_argument_mismatch (explain_p, parm, arg); while (CONVERT_EXPR_P (arg)) arg = TREE_OPERAND (arg, 0); diff --git a/gcc/testsuite/g++.dg/cpp1z/nontype-auto23.C b/gcc/testsuite/g++.dg/cpp1z/nontype-auto23.C new file mode 100644 index 00000000000..467559ffdda --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp1z/nontype-auto23.C @@ -0,0 +1,23 @@ +// PR c++/99186 +// { dg-do compile { target c++17 } } + +template +struct tuple_impl : tuple_impl { }; + +template +struct tuple_impl { }; + +template +struct tuple : tuple_impl<0, T, U> { }; + +template +void get(const tuple_impl&); + +template +struct S; + +int main() { + tuple,S<1U>> x; + get>(x); + get>(x); +} diff --git a/gcc/testsuite/g++.dg/cpp1z/nontype-auto24.C b/gcc/testsuite/g++.dg/cpp1z/nontype-auto24.C new file mode 100644 index 00000000000..52e4c134ccd --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp1z/nontype-auto24.C @@ -0,0 +1,18 @@ +// PR c++/104867 +// { dg-do compile { target c++17 } } + +enum class Foo { A1 }; + +enum class Bar { B1 }; + +template struct enum_; + +template struct list { }; + +template void f(list, V>); + +struct enum_type_map : list, int>, list, double> { }; + +int main() { + f(enum_type_map()); +}