From patchwork Fri Jan 10 16:37:25 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Merrill X-Patchwork-Id: 104499 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 89C753858289 for ; Fri, 10 Jan 2025 16:39:04 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 89C753858289 Authentication-Results: sourceware.org; dkim=pass (1024-bit key, unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=BQAAgE+E X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTP id 01CD33858CD9 for ; Fri, 10 Jan 2025 16:38:00 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 01CD33858CD9 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 01CD33858CD9 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=1736527081; cv=none; b=n+sU8yxwsudFau0ZMg3tpSOfcphElIiRDCWy3lWzaZ7R/+NycC3KMowc3hGRMchUKHqMrEM3XYD6QK7L/cOJxLTKtRzObQAIu3YaRJiKJ+dzybkeKm1VBUSzEB0P8vvDt0DI3KqVPmFfpzLcC5ya+2PxYaAfuD3w6E/HZexWfNk= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1736527081; c=relaxed/simple; bh=lYZGJoxquZYXHSl5RVy5RAG3TzlEXVCN1PcUgmL0T2k=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=AXJiDTaRrPahbH9KID1ekA4r428jSQ+1X91oDHQwpEcm+0lmsD8uOXh6s8lHQySbRyLwcHHIiHVxZ5JZdrkw52gI/dJ7Kftf/84e+HUEBCwI3B4nzkCDQ6pc+2ujmVq3iD+yLoWe58tKlpuPjAMBa8d0T/YxLiokXrIVaKTXy30= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 01CD33858CD9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1736527080; 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=4EKX/w/J1Y9wXOsgaH/DGrPXvBrVZ+72QdWxSVstM5U=; b=BQAAgE+E2dpjWmKWHJm6PL+vzxii5n65U/3R1u1K8E3EJlcsekyxX/c+9Pb2oPO6bQwLzX HuKoSZiFa8igF3r47VIor2BJlht7h3t0qb7vIA8lmXGm0M0zKucUGItkZ86D82yRaiSz1y yUWkoAPd0aVn7Lvq1wVPtvtOppeOZvE= Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-561-OlwgkS8LMMWlgHdSOzLUAw-1; Fri, 10 Jan 2025 11:37:58 -0500 X-MC-Unique: OlwgkS8LMMWlgHdSOzLUAw-1 X-Mimecast-MFC-AGG-ID: OlwgkS8LMMWlgHdSOzLUAw Received: by mail-qk1-f200.google.com with SMTP id af79cd13be357-7bcdb02f43cso251232285a.3 for ; Fri, 10 Jan 2025 08:37:58 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736527077; x=1737131877; 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=4EKX/w/J1Y9wXOsgaH/DGrPXvBrVZ+72QdWxSVstM5U=; b=eq56QkkNpsJ+KE03AJBS9+1rJgL2E1D6VMwxoSTHcLrOtrqpww+X2kw85wHHG73WcU hBd4I0TbyGEOYT7xV6z0MTUoFN3nPO3RC7YBqd2vNgLBgqNnL5t5k2bwrhcMrdh7GCge Ayz+pblYkIrLH9w1xektPWkJ78/2n1pSnplaXFnY9Z6TFSONtXVdLkYSRMI7FEPcpbp2 Qzg7IgPabHYHM+e+0b5q3GtanlGbJdnLMhDnJYbqIPtaxtGWJtKov4aHABXPEvCtGeV+ Mzmnoexr+PE3qBVdfaQKdzGEAw5DWb598lIlkVskkk2qV1Sb4BEFciXz1C/PCRCeFBIK FL6A== X-Gm-Message-State: AOJu0YwUEqqR53KnNwLLRJWBnHMsgg9k1dP8UNPEEAYXS/awsl3jHZnC O2jR7JzEWsf0zl5h39ryAqbKvyjAwYrX5EmO/63l7dFEslb1AMTA431xjfkx45dWEYey47zx+ld Z3nFTtODhW3nWbxfHHsJTtkwJuNtuSHEilXghqzv09TVIku+vYEqlhb3jc/pBxD+xHBGhlH2P61 6XfxVEScNlfU+KPhouZd+TpYuUIxEGALUWN2iHPg== X-Gm-Gg: ASbGncs1f1K/qQYTXJ48xXzCntULVNXUp8ayDH2f1+08m/7amDPScsFFImYqjWZHqB8 gUsqDhztHkAzLnPhOdTu/BxP53+5nVUOQrUZ6UCW3iAedTNpQvNFY3r7OvSM1hQMgBkJj9+q7M6 QpLPFE6LSWuWojqVHGcoDAOgWzUMkHjrN9pUS8NfV4FRnHSPcN/7Lk50z0aJjVwkZvVnlCh9YI2 fSnM+DDKA2i5WPqMl8MxWLT6z9D7MIHbi5N6dUrl5Cz03v/v/f7CCGES8HI7EuHr0B/spMnLPwJ 4p//Cb9ctOF5E4nqlhodsULSxRzsYW6w65CKth5xZ50+yHJKiQ9IhZfRcNtgABE0ZN8HwDjD8c2 f0NNdOAK0hw== X-Received: by 2002:a05:620a:179e:b0:7a9:ad65:f4a1 with SMTP id af79cd13be357-7bcd970ad4cmr1632019785a.26.1736527077512; Fri, 10 Jan 2025 08:37:57 -0800 (PST) X-Google-Smtp-Source: AGHT+IGY6CCEtLpEA66wS1WxOf77svsJbHZAeGR+oJ/KKaMfQquVv6SRW95Jy8lqBBU+hC8cOQVaaw== X-Received: by 2002:a05:620a:179e:b0:7a9:ad65:f4a1 with SMTP id af79cd13be357-7bcd970ad4cmr1632011785a.26.1736527076343; Fri, 10 Jan 2025 08:37:56 -0800 (PST) Received: from jason-thinkpadp1gen4i.rmtusma.csb (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 af79cd13be357-7bce327bed4sm187680385a.58.2025.01.10.08.37.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Jan 2025 08:37:54 -0800 (PST) From: Jason Merrill To: gcc-patches@gcc.gnu.org Subject: [pushed] c++: modules and DECL_REPLACEABLE_P Date: Fri, 10 Jan 2025 11:37:25 -0500 Message-ID: <20250110163752.56478-1-jason@redhat.com> X-Mailer: git-send-email 2.47.1 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: BdzAtnqQzpuqKVFjre7LVZxe8f6EaNCTSGJOjaiyAhw_1736527078 X-Mimecast-Originator: redhat.com content-type: text/plain; charset="US-ASCII"; x-default=true X-Spam-Status: No, score=-11.6 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, SPF_HELO_NONE, SPF_NONE, TXREP, URIBL_BLACK autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces~patchwork=sourceware.org@gcc.gnu.org Tested x86_64-pc-linux-gnu, applying to trunk. -- 8< -- We need to remember that the ::operator new is replaceable to avoid a bogus error about __builtin_operator_new finding a non-replaceable function. This affected __get_temporary_buffer in stl_tempbuf.h. gcc/cp/ChangeLog: * module.cc (trees_out::core_bools): Write replaceable_operator. (trees_in::core_bools): Read it. gcc/testsuite/ChangeLog: * g++.dg/modules/operator-2_a.C: New test. * g++.dg/modules/operator-2_b.C: New test. --- gcc/cp/module.cc | 2 ++ gcc/testsuite/g++.dg/modules/operator-2_a.C | 14 ++++++++++++++ gcc/testsuite/g++.dg/modules/operator-2_b.C | 8 ++++++++ 3 files changed, 24 insertions(+) create mode 100644 gcc/testsuite/g++.dg/modules/operator-2_a.C create mode 100644 gcc/testsuite/g++.dg/modules/operator-2_b.C base-commit: 9193641d1695293006ed0b818bb4161a1b6fbed2 diff --git a/gcc/cp/module.cc b/gcc/cp/module.cc index 7288c46a7ba..4fbe522264b 100644 --- a/gcc/cp/module.cc +++ b/gcc/cp/module.cc @@ -5640,6 +5640,7 @@ trees_out::core_bools (tree t, bits_out& bits) WB (t->function_decl.has_debug_args_flag); WB (t->function_decl.versioned_function); + WB (t->function_decl.replaceable_operator); /* decl_type is a (misnamed) 2 bit discriminator. */ unsigned kind = t->function_decl.decl_type; @@ -5796,6 +5797,7 @@ trees_in::core_bools (tree t, bits_in& bits) RB (t->function_decl.has_debug_args_flag); RB (t->function_decl.versioned_function); + RB (t->function_decl.replaceable_operator); /* decl_type is a (misnamed) 2 bit discriminator. */ unsigned kind = 0; diff --git a/gcc/testsuite/g++.dg/modules/operator-2_a.C b/gcc/testsuite/g++.dg/modules/operator-2_a.C new file mode 100644 index 00000000000..0b1f6e80422 --- /dev/null +++ b/gcc/testsuite/g++.dg/modules/operator-2_a.C @@ -0,0 +1,14 @@ +// { dg-additional-options -fmodules } +// { dg-module-cmi M } + +module; + +#include + +export module M; + +export template +inline T* alloc (__SIZE_TYPE__ n) +{ + return (T*) __builtin_operator_new (n * sizeof (T), std::nothrow_t{}); +}; diff --git a/gcc/testsuite/g++.dg/modules/operator-2_b.C b/gcc/testsuite/g++.dg/modules/operator-2_b.C new file mode 100644 index 00000000000..fb21ccb6d30 --- /dev/null +++ b/gcc/testsuite/g++.dg/modules/operator-2_b.C @@ -0,0 +1,8 @@ +// { dg-additional-options -fmodules } + +import M; + +int main() +{ + int *p = alloc(42); +}