From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pf1-x42f.google.com (mail-pf1-x42f.google.com [IPv6:2607:f8b0:4864:20::42f]) by sourceware.org (Postfix) with ESMTPS id 0A7CD3858D1E for ; Sun, 6 Aug 2023 18:16:13 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 0A7CD3858D1E Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-pf1-x42f.google.com with SMTP id d2e1a72fcca58-686b643df5dso2546494b3a.1 for ; Sun, 06 Aug 2023 11:16:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1691345772; x=1691950572; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=AqnZKsllodwcGCMSFUxDdCzHkc0dkvfad515VMoa4kQ=; b=LbdidTForWYCEr01nIbwpdKhtHLpVjxLzhzroc3s53fbu+ATgT4QzOSSDxvjQIx9az 1o3wSy6DffhoF1d6SBXtN8V+AdJ9rT7ZyYZuYMPr1ukxa2zZv0vj/1HXdxnYhIesquAG ElNbqpUX+8exo9n5ejp63CFfTafbLjRsWTUP4N97Z3ZErNNwY12Q0tYM9RpgfuNnd0dE fkwfUb1oIKRxBtt111rTwXP7KB66UgDVpd8F8v4EQEjNR+r/6c7SsMwEsUYIWQ1ttr7K deLIe6MRxhYvgrW15tsvSvbjXl65YLLUmMp7PECkrSybLg0Eh8J+N5Kk2CeyJon3JOke TuQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691345772; x=1691950572; 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=AqnZKsllodwcGCMSFUxDdCzHkc0dkvfad515VMoa4kQ=; b=c2nsOILIUYqcvGr4M6ZBcjXB2FspOrwY03nWbDhfORATUMC9OwUmenC00d4/e8eUvs R8aMw9c0ZakafAUOp+jchDNegoZJRRKVR1dVWcUptpfjSj/KStLwaCJfcSB+RjE8zFCX 9e5ndf9GJUWz5TxoocHAmHdAM/lEHXBFB0OIpiehA0lmL3VCX/zDKqqKzOum9Qfdd8ee gOaUr5kCYGXiW5ucJVklNlF7nRwCyBk+HvFxpaTDxuA6aCgPaO3NB+cPbDRNHHo4y+j6 pK1pSLlCeeKcMe58IhOrE8hMH3iHk/aAINH1HzVtmIkExDnvuqg5phqKGDkkIc6ThoJ/ CQIw== X-Gm-Message-State: AOJu0YzHBIF/9jHigz9yhS79MwMmpWy+HVycai177f7TiHFAbtKeVbaR AMEKNv01nhFcYNUgmuX0QTJbEt2fZLHvJbMB X-Google-Smtp-Source: AGHT+IEFqabiTJKPByuEr6gE5q4lNmWX0dz3Fdf79zs46pyJDSAjzPOfUHCcx7HYQhbmhb3r34QMxw== X-Received: by 2002:a05:6a20:1441:b0:12f:eb74:72b6 with SMTP id a1-20020a056a20144100b0012feb7472b6mr7691453pzi.60.1691345771791; Sun, 06 Aug 2023 11:16:11 -0700 (PDT) Received: from localhost ([2604:180:3:8e4::8d47]) by smtp.gmail.com with ESMTPSA id y5-20020a1709029b8500b001b8943b37a5sm5201051plp.24.2023.08.06.11.16.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 06 Aug 2023 11:16:11 -0700 (PDT) From: gnaggnoyil To: gcc-patches@gcc.gnu.org Cc: jason@redhat.com, nathan@acm.org, polacek@redhat.com, gnaggnoyil Subject: [PATCH] c++: follow DR 2386 and update implementation of get_tuple_size [PR110216] Date: Mon, 7 Aug 2023 02:15:35 +0800 Message-ID: <20230806181535.71101-1-gnaggnoyil@gmail.com> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-10.6 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 List-Id: DR 2386 updated the tuple_size requirements for structured binding and it now requires tuple_size to be considered only if std::tuple_size names a complete class type with member value. GCC before this patch does not follow the updated requrements, and this patch is intended to implement it. DR 2386 PR c++/110216 gcc/cp/ChangeLog: * decl.cc (get_tuple_size): Update implemetation to follow DR 2386. gcc/testsuite/ChangeLog: * g++.dg/cpp1z/pr110216.C: New test. Signed-off-by: Yonggang Li --- gcc/cp/decl.cc | 6 +++++- gcc/testsuite/g++.dg/cpp1z/pr110216.C | 21 +++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/g++.dg/cpp1z/pr110216.C diff --git a/gcc/cp/decl.cc b/gcc/cp/decl.cc index 792ab330dd0..923b81a33b0 100644 --- a/gcc/cp/decl.cc +++ b/gcc/cp/decl.cc @@ -8940,10 +8940,14 @@ get_tuple_size (tree type) /*context*/std_node, /*entering_scope*/false, tf_none); inst = complete_type (inst); - if (inst == error_mark_node || !COMPLETE_TYPE_P (inst)) + if (inst == error_mark_node + || !COMPLETE_TYPE_P (inst) + || !CLASS_TYPE_P (type)) return NULL_TREE; tree val = lookup_qualified_name (inst, value_identifier, LOOK_want::NORMAL, /*complain*/false); + if (val == error_mark_node) + return NULL_TREE; if (VAR_P (val) || TREE_CODE (val) == CONST_DECL) val = maybe_constant_value (val); if (TREE_CODE (val) == INTEGER_CST) diff --git a/gcc/testsuite/g++.dg/cpp1z/pr110216.C b/gcc/testsuite/g++.dg/cpp1z/pr110216.C new file mode 100644 index 00000000000..be4fd5f7053 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp1z/pr110216.C @@ -0,0 +1,21 @@ +// DR 2386 +// PR c++/110216 +// { dg-do compile { target c++17 } } + + +namespace std{ + template struct tuple_size; +} + +struct A { + int x = 0; +}; + +template <> struct std::tuple_size <::A> {}; + +auto [x] = A{}; + +int +main () +{ +} -- 2.41.0