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.133.124]) by sourceware.org (Postfix) with ESMTPS id F1441389FC37 for ; Tue, 10 May 2022 14:17:08 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org F1441389FC37 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.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-674-bb2W46afPDuNqJiM4vwsOg-1; Tue, 10 May 2022 10:17:07 -0400 X-MC-Unique: bb2W46afPDuNqJiM4vwsOg-1 Received: by mail-qv1-f71.google.com with SMTP id kl11-20020a056214518b00b0045a9af67efbso14355364qvb.18 for ; Tue, 10 May 2022 07:17:07 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:to:references:from:in-reply-to :content-transfer-encoding; bh=saXLo71VDJId+FfpHRbgTvtyL72NgTLgWbf0+u3ZOCI=; b=ygdC1ITRE8DDUiLkuNxIS9KpRiH+jvSndI2IC/LCAFkPp0q9b/Feg2OudcCN+Lx6TC ov5Hl04Ll+3CkK9WgoSEqReN3g5DSva3+XAl0NXqP3PpTe2FgV1ErhKO3SgvTlaw46vt ypNaK57XWXhjh5uzOvJ/ipFpVlUKUuyqR/ARp+M7k3cGOnH928oSwf3Psz1rLcahWyKl COoFn067dD+LHEV9/VNNJzExZzh/Yxq8y2rdtJX9iBmngMTihOAyI2lFVHxdJoaPRI3s 4GvYi0o9SYwf0OwCF/7imKyTrQE8T0xJxNwIoDRusckgvcc0mUJ7ezlyZToVMef5JozS 0IHg== X-Gm-Message-State: AOAM531zMM1O6ThrUDmbnznQFLpxx7e4LYRBz+HnvOXku5YttkN0e0V+ 3jQIVzZj1X1fDTwvrTtryGUO3SZjbDnxKSAJs/qLPCNDvNeOszxkfNhAwffz/TyEnm7IdN6XUHr +unZx3qSQFi1TkB6ifg== X-Received: by 2002:a05:620a:40d0:b0:6a0:25c7:a28d with SMTP id g16-20020a05620a40d000b006a025c7a28dmr16006579qko.340.1652192226426; Tue, 10 May 2022 07:17:06 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyCclgAeGeJy8KT8HQLOp/uN7QJmxKh9+I7zyAAHavf4lJSXsD+YftUc08LcCkAmQl4mncGHw== X-Received: by 2002:a05:620a:40d0:b0:6a0:25c7:a28d with SMTP id g16-20020a05620a40d000b006a025c7a28dmr16006545qko.340.1652192226018; Tue, 10 May 2022 07:17:06 -0700 (PDT) Received: from [192.168.1.100] (130-44-159-43.s15913.c3-0.arl-cbr1.sbo-arl.ma.cable.rcncustomer.com. [130.44.159.43]) by smtp.gmail.com with ESMTPSA id e26-20020ac8671a000000b002f39b99f6c2sm9169845qtp.92.2022.05.10.07.17.04 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 10 May 2022 07:17:04 -0700 (PDT) Message-ID: <3cf2250f-1710-6407-87d5-716ffef59694@redhat.com> Date: Tue, 10 May 2022 10:17:03 -0400 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.9.0 Subject: Re: [PATCH 1/2] c++: Harden *_PACK_EXPANSION and *_ARGUMENT_PACK macros To: Patrick Palka , gcc-patches@gcc.gnu.org References: <20220510134037.628893-1-ppalka@redhat.com> From: Jason Merrill In-Reply-To: <20220510134037.628893-1-ppalka@redhat.com> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-13.7 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, NICE_REPLY_A, RCVD_IN_DNSWL_LOW, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE, UPPERCASE_50_75 autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 May 2022 14:17:11 -0000 On 5/10/22 09:40, Patrick Palka wrote: > The accessor macros for TYPE_PACK_EXPANSION/EXPR_PACK_EXPANSION > and TYPE_ARGUMENT_PACK/NONTYPE_ARGUMENT_PACK should check the > tree code of the argument. > > Bootstrapped and regtested on x86_64-pc-linux-gnu, does this look OK for > trunk? OK. > gcc/cp/ChangeLog: > > * cp-tree.h (PACK_EXPANSION_CHECK): Define. > (PACK_EXPANSION_PATTERN): Use PACK_EXPANSION_CHECK. > (SET_PACK_EXPANSION_PATTERN): Likewise. > (PACK_EXPANSION_PARAMETER_PACKS): Likewise. > (PACK_EXPANSION_EXTRA_ARGS): Likewise. > (PACK_EXPANSION_LOCAL_P): Likewise. > (PACK_EXPANSION_SIZEOF_P): Likewise. > (PACK_EXPANSION_AUTO_P): Likewise. > (PACK_EXPANSION_FORCE_EXTRA_ARGS_P): Likewise. > (ARGUMENT_PACK_CHECK): Define. > (ARGUMENT_PACK_ARGS): Use ARGUMENT_PACK_CHECK. > (SET_ARGUMENT_PACK_ARGS): Likewise. > * parser.c (cp_parser_sizeof_pack): Check for error_mark_node > before setting PACK_EXPANSION_SIZEOF_P. > --- > gcc/cp/cp-tree.h | 34 ++++++++++++++++++++++------------ > gcc/cp/parser.cc | 3 ++- > 2 files changed, 24 insertions(+), 13 deletions(-) > > diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h > index 8a5057a4dff..29fc0e5f829 100644 > --- a/gcc/cp/cp-tree.h > +++ b/gcc/cp/cp-tree.h > @@ -3894,16 +3894,19 @@ struct GTY(()) lang_decl { > (TREE_CODE (NODE) == TYPE_PACK_EXPANSION \ > || TREE_CODE (NODE) == EXPR_PACK_EXPANSION) > > +#define PACK_EXPANSION_CHECK(NODE) \ > + TREE_CHECK2 (NODE, TYPE_PACK_EXPANSION, EXPR_PACK_EXPANSION) > + > /* Extracts the type or expression pattern from a TYPE_PACK_EXPANSION or > EXPR_PACK_EXPANSION. */ > #define PACK_EXPANSION_PATTERN(NODE) \ > - (TREE_CODE (NODE) == TYPE_PACK_EXPANSION ? TREE_TYPE (NODE) \ > - : TREE_OPERAND (NODE, 0)) > + (TREE_CODE (PACK_EXPANSION_CHECK (NODE)) == TYPE_PACK_EXPANSION \ > + ? TREE_TYPE (NODE) : TREE_OPERAND (NODE, 0)) > > /* Sets the type or expression pattern for a TYPE_PACK_EXPANSION or > EXPR_PACK_EXPANSION. */ > #define SET_PACK_EXPANSION_PATTERN(NODE,VALUE) \ > - if (TREE_CODE (NODE) == TYPE_PACK_EXPANSION) \ > + if (TREE_CODE (PACK_EXPANSION_CHECK (NODE)) == TYPE_PACK_EXPANSION) \ > TREE_TYPE (NODE) = VALUE; \ > else \ > TREE_OPERAND (NODE, 0) = VALUE > @@ -3911,7 +3914,7 @@ struct GTY(()) lang_decl { > /* The list of parameter packs used in the PACK_EXPANSION_* node. The > TREE_VALUE of each TREE_LIST contains the parameter packs. */ > #define PACK_EXPANSION_PARAMETER_PACKS(NODE) \ > - *(TREE_CODE (NODE) == EXPR_PACK_EXPANSION \ > + *(TREE_CODE (PACK_EXPANSION_CHECK (NODE)) == EXPR_PACK_EXPANSION \ > ? &TREE_OPERAND (NODE, 1) \ > : &TYPE_MIN_VALUE_RAW (TYPE_PACK_EXPANSION_CHECK (NODE))) > > @@ -3922,22 +3925,26 @@ struct GTY(()) lang_decl { > are enclosing functions that provided function parameter packs we'll need > to map appropriately. */ > #define PACK_EXPANSION_EXTRA_ARGS(NODE) \ > - *(TREE_CODE (NODE) == TYPE_PACK_EXPANSION \ > + *(TREE_CODE (PACK_EXPANSION_CHECK (NODE)) == TYPE_PACK_EXPANSION \ > ? &TYPE_MAX_VALUE_RAW (NODE) \ > : &TREE_OPERAND ((NODE), 2)) > > /* True iff this pack expansion is within a function context. */ > -#define PACK_EXPANSION_LOCAL_P(NODE) TREE_LANG_FLAG_0 (NODE) > +#define PACK_EXPANSION_LOCAL_P(NODE) \ > + TREE_LANG_FLAG_0 (PACK_EXPANSION_CHECK (NODE)) > > /* True iff this pack expansion is for sizeof.... */ > -#define PACK_EXPANSION_SIZEOF_P(NODE) TREE_LANG_FLAG_1 (NODE) > +#define PACK_EXPANSION_SIZEOF_P(NODE) \ > + TREE_LANG_FLAG_1 (PACK_EXPANSION_CHECK (NODE)) > > /* True iff this pack expansion is for auto... in lambda init-capture. */ > -#define PACK_EXPANSION_AUTO_P(NODE) TREE_LANG_FLAG_2 (NODE) > +#define PACK_EXPANSION_AUTO_P(NODE) \ > + TREE_LANG_FLAG_2 (PACK_EXPANSION_CHECK (NODE)) > > /* True if we must use PACK_EXPANSION_EXTRA_ARGS and avoid partial > instantiation of this pack expansion. */ > -#define PACK_EXPANSION_FORCE_EXTRA_ARGS_P(NODE) TREE_LANG_FLAG_3 (NODE) > +#define PACK_EXPANSION_FORCE_EXTRA_ARGS_P(NODE) \ > + TREE_LANG_FLAG_3 (PACK_EXPANSION_CHECK (NODE)) > > /* True iff the wildcard can match a template parameter pack. */ > #define WILDCARD_PACK_P(NODE) TREE_LANG_FLAG_0 (NODE) > @@ -3947,16 +3954,19 @@ struct GTY(()) lang_decl { > (TREE_CODE (NODE) == TYPE_ARGUMENT_PACK \ > || TREE_CODE (NODE) == NONTYPE_ARGUMENT_PACK) > > +#define ARGUMENT_PACK_CHECK(NODE) \ > + TREE_CHECK2 (NODE, TYPE_ARGUMENT_PACK, NONTYPE_ARGUMENT_PACK) > + > /* The arguments stored in an argument pack. Arguments are stored in a > TREE_VEC, which may have length zero. */ > #define ARGUMENT_PACK_ARGS(NODE) \ > - (TREE_CODE (NODE) == TYPE_ARGUMENT_PACK? TREE_TYPE (NODE) \ > - : TREE_OPERAND (NODE, 0)) > + (TREE_CODE (ARGUMENT_PACK_CHECK (NODE)) == TYPE_ARGUMENT_PACK \ > + ? TREE_TYPE (NODE) : TREE_OPERAND (NODE, 0)) > > /* Set the arguments stored in an argument pack. VALUE must be a > TREE_VEC. */ > #define SET_ARGUMENT_PACK_ARGS(NODE,VALUE) \ > - if (TREE_CODE (NODE) == TYPE_ARGUMENT_PACK) \ > + if (TREE_CODE (ARGUMENT_PACK_CHECK (NODE)) == TYPE_ARGUMENT_PACK) \ > TREE_TYPE (NODE) = VALUE; \ > else \ > TREE_OPERAND (NODE, 0) = VALUE > diff --git a/gcc/cp/parser.cc b/gcc/cp/parser.cc > index 8da02de95fb..5071c030f53 100644 > --- a/gcc/cp/parser.cc > +++ b/gcc/cp/parser.cc > @@ -32563,7 +32563,8 @@ cp_parser_sizeof_pack (cp_parser *parser) > else if (TREE_CODE (expr) == CONST_DECL) > expr = DECL_INITIAL (expr); > expr = make_pack_expansion (expr); > - PACK_EXPANSION_SIZEOF_P (expr) = true; > + if (expr != error_mark_node) > + PACK_EXPANSION_SIZEOF_P (expr) = true; > > if (paren) > parens.require_close (parser);