From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 EF5183858D33 for ; Fri, 2 Feb 2024 03:22:07 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org EF5183858D33 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 EF5183858D33 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=1706844136; cv=none; b=xp1smiZShQptIOo6kQhwZK1+0gInQVs2SSyt06fFpW6g4FUkZ2hcPhddJWrQGiS9Jh7kqvC4egZ1Cy0SG2evbdWYj3gaGNlk5N8cJQSsJ8CsHsO6WN2LTyRdSOls4FYHvfHvVrUHY6YPUoNSv7WZbYGYjfNeMwfIA6rbbJUaVQ4= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706844136; c=relaxed/simple; bh=gHojRQwE6wxoDcFrODB6r+M3/NMv5W8ztUog7ZoMCJQ=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=izydIf3ySzCIujcsoHkdVGuDAVZAmrexiU+DN+0TQE4wybRyBviUyzw+GYgrlRgRTr61Z3TQLjXsIRq3V0bnaHPwzEE6oP6ljv361XIKErxOs1wYqPYdEMipasHloydwPCqRBPsMnlem6mOt3+6wQO1tay3uD2qrNehmRv8qxwU= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1706844127; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HA16R3x23Nwm26+K8C+EOi2FGClTkBIdy4wonKnjt7w=; b=iVHd4UPLfzT5VjEsVm2hpk0uJrgqDSdF+1eSulnE64pwej4gTAGz2UTLCs0ppU1Bxl4tIB BE/saApZ5xFc/b4AUMqk3TpwKwuUfAKXEAgWqY/VZpxaCjA3qso6LzGA36hcAxpc+m6+MS qQ68qeUBRZQR9/3QvaPo10qJH1ctE8E= Received: from mail-vs1-f72.google.com (mail-vs1-f72.google.com [209.85.217.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-633-6AnNLzuQOqW4emx4Ni4_Vw-1; Thu, 01 Feb 2024 22:22:05 -0500 X-MC-Unique: 6AnNLzuQOqW4emx4Ni4_Vw-1 Received: by mail-vs1-f72.google.com with SMTP id ada2fe7eead31-46b5faa3405so618666137.2 for ; Thu, 01 Feb 2024 19:22:05 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706844125; x=1707448925; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=HA16R3x23Nwm26+K8C+EOi2FGClTkBIdy4wonKnjt7w=; b=inlPKGwAnusTrf5358qpMnsmu7D0EE21+GeNA9bzn/6fP3TLCD+ggMxylKKjtCH+QE I2vJUB6Xj2xsy3DRRmsdt+VM9ZyAg8YEsd/jYrxGxEA1rfYdGHfuRhTdFIozv2NTq8YK M5I24Gp1NEVOEpouD4Pipd9A/yoMAB07AxuMh3QEYCQN+OnGa8vLKZS9ZzuhGWQ7jgZC MLYndmcDbNVgWrRYD4sF6HpjgM630jfyNGzPczBpMmjd9AWjLfjOu8mF+ZUmJu1dkkeJ WTaTqQVrf6k4BfFBL8m0vO3qOq1o9KCqZ5hFwpREKFtOr/C8IPUIHcOwtmowGxsoUvuW yYFA== X-Gm-Message-State: AOJu0YzBH9NnFcQ9qg3q4/PzXDus5ABFN/aqRN3IEIKPwp+PSgnvJikf riLkU36uuRX2YSdJOaKeo6pTXbrHJVMOnvDx/bsOjKi7oQ52UWHPU98AcDpQIn5z5OsyFahQkRV DjeWesQX7Hgeoiu8dQZno1GEIQDggWKc8tCsM6R5ApmaP4Jai8h7Xi91i6CfzA2YPwgCIKwJT0T 8sCf0y4K7qFPWRYm1Gr4W5/M9/8fmaSv1gLhU= X-Received: by 2002:a67:fd0a:0:b0:46c:f984:518c with SMTP id f10-20020a67fd0a000000b0046cf984518cmr2216648vsr.3.1706844124810; Thu, 01 Feb 2024 19:22:04 -0800 (PST) X-Google-Smtp-Source: AGHT+IHmd2tWxEjlPxY3rYl9vcc9FWYfd198GYb7OY4rNFuodmDfBfg3k+9bDg1Sj2rOM0Do7jY6Hg== X-Received: by 2002:a67:fd0a:0:b0:46c:f984:518c with SMTP id f10-20020a67fd0a000000b0046cf984518cmr2216639vsr.3.1706844124347; Thu, 01 Feb 2024 19:22:04 -0800 (PST) Received: from jason.com (130-44-146-16.s12558.c3-0.arl-cbr1.sbo-arl.ma.cable.rcncustomer.com. [130.44.146.16]) by smtp.gmail.com with ESMTPSA id ny3-20020a056214398300b0068c682934e0sm395109qvb.83.2024.02.01.19.22.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Feb 2024 19:22:03 -0800 (PST) From: Jason Merrill To: gcc-patches@gcc.gnu.org Subject: [pushed] c++: variable template array of unknown bound [PR113638] Date: Thu, 1 Feb 2024 22:22:01 -0500 Message-Id: <20240202032201.171532-1-jason@redhat.com> X-Mailer: git-send-email 2.39.3 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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_H2,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 List-Id: Tested x86_64-pc-linux-gnu, applying to trunk. -- 8< -- When we added variable templates, we didn't extend the VAR_HAD_UNKNOWN_BOUND handling for class template static data members to handle them as well. PR c++/113638 gcc/cp/ChangeLog: * cp-tree.h: Adjust comment. * pt.cc (instantiate_template): Set VAR_HAD_UNKNOWN_BOUND for variable template. gcc/testsuite/ChangeLog: * g++.dg/cpp1y/var-templ-array1.C: New test. --- gcc/cp/cp-tree.h | 2 +- gcc/cp/pt.cc | 13 ++++++++++--- gcc/testsuite/g++.dg/cpp1y/var-templ-array1.C | 7 +++++++ 3 files changed, 18 insertions(+), 4 deletions(-) create mode 100644 gcc/testsuite/g++.dg/cpp1y/var-templ-array1.C diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h index f46b448ce0d..969c7239c97 100644 --- a/gcc/cp/cp-tree.h +++ b/gcc/cp/cp-tree.h @@ -3251,7 +3251,7 @@ struct GTY(()) lang_decl { #define DECL_CONV_FN_TYPE(FN) \ TREE_TYPE ((gcc_checking_assert (DECL_CONV_FN_P (FN)), DECL_NAME (FN))) -/* Nonzero if NODE, a static data member, was declared in its class as an +/* Nonzero if NODE, a templated variable, was declared as an array of unknown bound. */ #define VAR_HAD_UNKNOWN_BOUND(NODE) \ (DECL_LANG_SPECIFIC (VAR_DECL_CHECK (NODE)) \ diff --git a/gcc/cp/pt.cc b/gcc/cp/pt.cc index 16febb1ba7f..9d30a271713 100644 --- a/gcc/cp/pt.cc +++ b/gcc/cp/pt.cc @@ -22105,9 +22105,16 @@ instantiate_template (tree tmpl, tree orig_args, tsubst_flags_t complain) DECL_TI_TEMPLATE (fndecl) = tmpl; DECL_TI_ARGS (fndecl) = targ_ptr; if (VAR_P (pattern)) - /* Now that we we've formed this variable template specialization, - remember the result of most_specialized_partial_spec for it. */ - TI_PARTIAL_INFO (DECL_TEMPLATE_INFO (fndecl)) = partial_ti; + { + /* Now that we we've formed this variable template specialization, + remember the result of most_specialized_partial_spec for it. */ + TI_PARTIAL_INFO (DECL_TEMPLATE_INFO (fndecl)) = partial_ti; + + /* And remember if the variable was declared with []. */ + if (TREE_CODE (TREE_TYPE (fndecl)) == ARRAY_TYPE + && TYPE_DOMAIN (TREE_TYPE (fndecl)) == NULL_TREE) + SET_VAR_HAD_UNKNOWN_BOUND (fndecl); + } fndecl = register_specialization (fndecl, gen_tmpl, targ_ptr, false, hash); if (fndecl == error_mark_node) diff --git a/gcc/testsuite/g++.dg/cpp1y/var-templ-array1.C b/gcc/testsuite/g++.dg/cpp1y/var-templ-array1.C new file mode 100644 index 00000000000..b0ff7e74556 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp1y/var-templ-array1.C @@ -0,0 +1,7 @@ +// PR c++/113638 +// { dg-do compile { target c++14 } } + +template +constexpr int my_array[]{Is...}; +constexpr auto t1 = my_array<2>; +static_assert(sizeof(my_array<1>) == sizeof(int) * 1, ""); base-commit: e0701f8f7b6dcddb299eb5345e510cf9ea419150 -- 2.39.3