From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-qt1-x82b.google.com (mail-qt1-x82b.google.com [IPv6:2607:f8b0:4864:20::82b]) by sourceware.org (Postfix) with ESMTPS id CEA3D3858D28 for ; Tue, 20 Sep 2022 11:32:18 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org CEA3D3858D28 Authentication-Results: sourceware.org; dmarc=fail (p=none dis=none) header.from=acm.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-qt1-x82b.google.com with SMTP id c11so1423228qtw.8 for ; Tue, 20 Sep 2022 04:32:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :sender:from:to:cc:subject:date; bh=UaTVXY05D3Mhtzj3QuopX5LrxAEF6klHjMUmrCF0/UA=; b=ZXPqKcR+xidQrzafksFF6avZUc4TBeL8VUhQ7w2n44eK8wD3QxJThAM8jAhNFg5PlC HiVu7Q2sObSkcfUre3gj27te/ww/TjPpmEYr4VP4JW6rto+Sg14XWb1+v4lku1oRCCjr GGIlxz+O3841wWPYNNlupBl6kKAU422iRweg7wXtahobDGX5hEaD5MCb/9qLsbxinqDI SJO7Km8bYbkNk8xd3UnRFeNBVaCxyBCOAbDd1ETSRui5QdAU6OeXwx1P131awzsZSqsl Uif+4tH8elnknYdwxY+4tWNqCvalwz6924mQGvAzVefebtQPno2+/EGYFogScBCG5t45 5YMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :sender:x-gm-message-state:from:to:cc:subject:date; bh=UaTVXY05D3Mhtzj3QuopX5LrxAEF6klHjMUmrCF0/UA=; b=Tbjc+A/qdi6Q+xzBDKYht8cofmN2d8K4wrEA5PEuqazl1I70NHVpHaVxLwFoYCNrKI Zn92D9LhCTxwTlozCbQvzh4nGZNZ461gQcmuogFsDe6HwG+u9ZCikfe52M52UBZ3RcVM Rucu/q9ZJ7uLS5mfV58na+4UZMWjIQlRdHhfSBPea4E2Y/mr01Dvs2Ij9oODJR6fd2OD inOv2oT006EJlUgsH1vgYvo5P93BjSmt0ElRXzDTrz5r4I4SiNJbFzDn42Azj4ts9Bui 83ntAEWNuBxB7R+QccxHZQivL3QKlVMMGXwjmibi1muhVaxrteSFoxwmd9lP6AnXwTBI 4JJA== X-Gm-Message-State: ACrzQf1tE22lLfK58xDgMZ1xdTzHj8wcPwzaV+QY0A4HOCYVzC71Zza8 Oaw6CANoqNgJX7941eZRUOk= X-Google-Smtp-Source: AMsMyM5vb27OYJ1e+Xh1IKdCuNejvMdOtSUyYiRgLW4uzxsxfJMLWzGIZDZASZD1KI7VoujUraBBJw== X-Received: by 2002:ac8:5b05:0:b0:35c:e1ed:a816 with SMTP id m5-20020ac85b05000000b0035ce1eda816mr10224626qtw.208.1663673538039; Tue, 20 Sep 2022 04:32:18 -0700 (PDT) Received: from ?IPV6:2620:10d:c0a3:1407:276b:ab8d:b999:a886? ([2620:10d:c091:500::4:bad6]) by smtp.googlemail.com with ESMTPSA id dm13-20020a05620a1d4d00b006a6ebde4799sm887447qkb.90.2022.09.20.04.32.17 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 20 Sep 2022 04:32:17 -0700 (PDT) Sender: Nathan Sidwell Message-ID: Date: Tue, 20 Sep 2022 07:32:17 -0400 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.2.1 Subject: Re: [PATCH] c++: stream PACK_EXPANSION_EXTRA_ARGS [PR106761] Content-Language: en-US To: Patrick Palka , gcc-patches@gcc.gnu.org Cc: jason@redhat.com References: <20220919135229.86545-1-ppalka@redhat.com> From: Nathan Sidwell In-Reply-To: <20220919135229.86545-1-ppalka@redhat.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-3040.2 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM,GIT_PATCH_0,HEADER_FROM_DIFFERENT_DOMAINS,NICE_REPLY_A,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: On 9/19/22 09:52, Patrick Palka wrote: > It looks like some xtreme-header-* tests are failing after the libstdc++ > change r13-2158-g02f6b405f0e9dc ultimately because we're neglecting > to stream PACK_EXPANSION_EXTRA_ARGS, which leads to false equivalences > of different partial instantiations of _TupleConstraints::__constructible. > > Tested on x86_64-pc-linux-gnu, does this look OK for trunk? > > PR c++/106761 > > gcc/cp/ChangeLog: > > * module.cc (trees_out::type_node) : > Stream PACK_EXPANSION_EXTRA_ARGS. > (trees_in::tree_node) : Likewise. Looks good, I wonder why I missed that. (I guess extracting a testcase out of the headers was too tricky?) nathan > --- > gcc/cp/module.cc | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/gcc/cp/module.cc b/gcc/cp/module.cc > index 1a1ff5be574..9a9ef4e3332 100644 > --- a/gcc/cp/module.cc > +++ b/gcc/cp/module.cc > @@ -8922,6 +8922,7 @@ trees_out::type_node (tree type) > if (streaming_p ()) > u (PACK_EXPANSION_LOCAL_P (type)); > tree_node (PACK_EXPANSION_PARAMETER_PACKS (type)); > + tree_node (PACK_EXPANSION_EXTRA_ARGS (type)); > break; > > case TYPENAME_TYPE: > @@ -9455,12 +9456,14 @@ trees_in::tree_node (bool is_use) > { > bool local = u (); > tree param_packs = tree_node (); > + tree extra_args = tree_node (); > if (!get_overrun ()) > { > tree expn = cxx_make_type (TYPE_PACK_EXPANSION); > SET_TYPE_STRUCTURAL_EQUALITY (expn); > PACK_EXPANSION_PATTERN (expn) = res; > PACK_EXPANSION_PARAMETER_PACKS (expn) = param_packs; > + PACK_EXPANSION_EXTRA_ARGS (expn) = extra_args; > PACK_EXPANSION_LOCAL_P (expn) = local; > res = expn; > } -- Nathan Sidwell