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 F400F3881D1D for ; Mon, 4 Dec 2023 21:52:45 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org F400F3881D1D 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 F400F3881D1D Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1701726776; cv=none; b=bm4i9YVqV37v6W3XMpf5LllA0ew39opAnVwHKP1B7h6l0ZpF0gFWFfLl5lf/r/tK+k/6QargK/24hgWoewcY6be0qqlAPvQv2a0bsLFkBRap2mvw5iWcNkzx1Awul09nxl1jdaJAOVMUHqbyODUtslFsw6z+yACl2ioHnl5gfqw= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1701726776; c=relaxed/simple; bh=XuYdXbkD0vNJix7yXKZsQIxj2VlTw6G26jMFCfN2FQ8=; h=DKIM-Signature:Message-ID:Date:MIME-Version:Subject:To:From; b=WByniL5t4+7CKIcHLV0Z7bw+6v0ANNCyY+8Xbx1mP3BiuqcPAga5UkoZmXuZ3OpVIBlqWb7JUosKdBpxt6O7eOxVj4Hve1lxViv1fHLlgDqX3lMJG2NoHLJYBQqFt6ZJjZk2HAfNiB6w7JGgMnRG/I+wBr6SFhDBFacDyAYGgsc= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1701726765; 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: in-reply-to:in-reply-to:references:references; bh=zNOxBtN60Pyd6iW2VHxZDHFyDS+StsranO6hYv8CeX4=; b=hh+69ng6VmqabENG+Ny0oyveubrzbeORFK7PX5l3mwrFAxcBbgxf3B3NMqo16Ew+Ut+lWH Qh0PG4DQoiN33hXD4gsUM+gb+fTkcSvi9hWLA/RDLUA4RylIkIAV5leFmwNVZg75udqDRX tIjUdOkhwbDdqjXO+6yy1T0kzG47sfw= 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-3-3oP_k_L4MwWZOBMFJZOCtQ-1; Mon, 04 Dec 2023 16:49:31 -0500 X-MC-Unique: 3oP_k_L4MwWZOBMFJZOCtQ-1 Received: by mail-qv1-f71.google.com with SMTP id 6a1803df08f44-67aa2707000so50031906d6.3 for ; Mon, 04 Dec 2023 13:49:31 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701726571; x=1702331371; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=zNOxBtN60Pyd6iW2VHxZDHFyDS+StsranO6hYv8CeX4=; b=CwY2fCCp6VW3ViO7XffnzuvJ6PpWb1KDuUqj59dC3qe+GGs3OmHdAHJZBq3vHP8Qon PxTq+CmGllCBGqbzTH0kUvUVrKAu4MJZjisJYanlhL/A3PZJB9qRSzITprHFtzGt+FjN B38yq5huB8WhSDPjMzjJAeIiu5vH0WChPf+u38Qo1vsAu1AEu1LPOiYjjUeSvnLUfNnT RZvSUywf/SEQLATS0R8Hinv7ztHqScPUNExzDmeU8F0FLXSucfHx6X3M2pmXL4ZLjTaH CrSuIKl+S/Ie2zdZ465pQ/WLoxUUyMbWf3XOkCGeiuD7yzoJdmirhvpqdzzPShad9e1u x/3A== X-Gm-Message-State: AOJu0Ywp5DP3c1lEDYYy5Vd1o/vbwn1D9k67dtjug+mAEDIZr2nZOI88 tjGjCdAi9IjqOUjJHFevNdOdCXicEgtTnJ6xzw2ZR5VkXCMfxX1f60eCYJ4hZzYf8+K/ME8pgdz VFyye1L7d4cNIkuTh7w== X-Received: by 2002:a05:6214:262a:b0:67a:d04a:87db with SMTP id gv10-20020a056214262a00b0067ad04a87dbmr282196qvb.105.1701726571266; Mon, 04 Dec 2023 13:49:31 -0800 (PST) X-Google-Smtp-Source: AGHT+IHaJbXKLrKVnHYSL1+D9BLblGUdzgWZc9YL4QY5znc8ni4QGYvhxCtoaKzBptWIJE6wQ3+mNw== X-Received: by 2002:a05:6214:262a:b0:67a:d04a:87db with SMTP id gv10-20020a056214262a00b0067ad04a87dbmr282186qvb.105.1701726571008; Mon, 04 Dec 2023 13:49:31 -0800 (PST) Received: from [192.168.1.145] (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 r13-20020a0ccc0d000000b0067a4a8f9456sm899095qvk.38.2023.12.04.13.49.30 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 04 Dec 2023 13:49:30 -0800 (PST) Message-ID: Date: Mon, 4 Dec 2023 16:49:29 -0500 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v7] c++: implement P2564, consteval needs to propagate up [PR107687] To: Marek Polacek Cc: GCC Patches References: <462dd81b-cfb2-4066-bca4-403335147f5d@redhat.com> <6a3303b5-85b3-4d8f-a4e3-4f41455ec6d1@redhat.com> <1d9a1b66-c1ba-4aa1-80e3-09c5e1840845@redhat.com> From: Jason Merrill In-Reply-To: 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=-6.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,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: On 12/4/23 15:23, Marek Polacek wrote: > +/* FN is not a consteval function, but may become one. Remember to > + escalate it after all pending templates have been instantiated. */ > + > +void > +maybe_store_immediate_escalating_fn (tree fn) > +{ > + if (unchecked_immediate_escalating_function_p (fn)) > + remember_escalating_expr (fn); > +} > +++ b/gcc/cp/decl.cc > @@ -18441,7 +18441,10 @@ finish_function (bool inline_p) > if (!processing_template_decl > && !DECL_IMMEDIATE_FUNCTION_P (fndecl) > && !DECL_OMP_DECLARE_REDUCTION_P (fndecl)) > - cp_fold_function (fndecl); > + { > + cp_fold_function (fndecl); > + maybe_store_immediate_escalating_fn (fndecl); > + } I think maybe_store_, and the call to it from finish_function, are unneeded; we will have already decided whether we need to remember the function during the call to cp_fold_function. OK with that change. Jason