From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: =?utf-8?Q?Gerd_M=C3=B6llmann?= Newsgroups: gmane.emacs.devel Subject: Re: Merging scratch/no-purespace to remove unexec and purespace Date: Tue, 17 Dec 2024 15:30:59 +0100 Message-ID: References: Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="18562"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: emacs-devel@gnu.org, Pip Cet , Stefan Monnier To: Stefan Kangas Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Tue Dec 17 15:31:53 2024 Return-path: Envelope-to: ged-emacs-devel@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1tNYc3-0004cg-SB for ged-emacs-devel@m.gmane-mx.org; Tue, 17 Dec 2024 15:31:51 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tNYbM-0005OV-Dq; Tue, 17 Dec 2024 09:31:08 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tNYbJ-0005Gq-0D for emacs-devel@gnu.org; Tue, 17 Dec 2024 09:31:05 -0500 Original-Received: from mail-ed1-x534.google.com ([2a00:1450:4864:20::534]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tNYbH-0005KY-9R for emacs-devel@gnu.org; Tue, 17 Dec 2024 09:31:04 -0500 Original-Received: by mail-ed1-x534.google.com with SMTP id 4fb4d7f45d1cf-5d3d479b1e6so6809360a12.2 for ; Tue, 17 Dec 2024 06:31:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1734445861; x=1735050661; darn=gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=SENtgOUUUQNltF5N6H3SRkt7NSH0eIcl0RsvuS3KH3c=; b=Rh7EaAw1CuRtqkyyCnNeKMtItxUfgW2GS14qv+7WIBgsF6KHnk0SVLo37k44e9joZa oWQpUUPJfayZ+r8vfc2IKNEywmDZNTSSOdJx0g0+9YRsuee+6tJLmGgpZH0rLxA3Kor6 2SN//htt8rXRXoNj7nwY9jBKwrxJxLJm94YyehaQ1uMcj/xY/slNQW1ijyGMq2HBNkkr E7h4T1m3zPElG5WlqRAieV7Iuqb+/r2PdprMTKXJff/2Mvm63WxxfTYQhzkOFWYJg51A 8C1oJGr7gCCha4Jm1jpDeCFgLOlco4OGepbgTqIX5r3gHIR/utjGEnF/hmdH/48hmpEh gkcQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734445861; x=1735050661; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=SENtgOUUUQNltF5N6H3SRkt7NSH0eIcl0RsvuS3KH3c=; b=gjfS8VdmyZCKs7ls2KdoLbpkviA9s3es3tkkVzAhx9g0EAnjukwVu2OhLX/nBCwtx1 xP9AVyvQzQN6uQw4D7Gu/yJRDR5v7ao2aGdykcETrEqdfAlQPBePy/SfZg9UJmA79iex LFIZZPwOurV0rRrNrtmoYookE9X4BnjNVhf8J1tRSjcX7hB03XGuTaOUXvAilTxW4Heb BN316S5ElByA4lMz9zSul1hcRwK0b7R94Xc1R2NMtRyfVUXSq0ZBiwdX8XnfrSTT92WB QxmzWPKkVjeEYlABtzg1V2QI4pqZVAvHuEg59wckmQd2l1xAHWZR/19ZcXicnw+I69tK d+kg== X-Gm-Message-State: AOJu0YwyMCnXXSn3g33UFui8JtSaI3faroEqIroH68uCDU8SBL230RIy WDMBwOFWnwY7Ad2LiudP1fGEid90HBIQd6hyK08qjLrStGLMZLQNa/tinkA2 X-Gm-Gg: ASbGnctFMyTb4Qu8PpMjY05fLvCjD8WD8tqfi4ovObuJG0J82z2wvHds2E4BvECmvAW c3z/6vrnZFozxDY5N/eo0OMMRUU/JucGVj2R3og8baF/cDKfQk7mDLeOcR6+Oe7kh33Zr7Zizvn uWny+tDZgHtqBXk/dD2l/crxeMA1dl7D0KwZl9iF8+C3Hbfr6bfIaoRcrgP83DsIRQInlHSi9IT fIvxrTD4eRfGyWIDe6hD3Z9NIfomX5UR7fqOEYYULLNlM2ZAx7z0O4hNmK+22gDMz7xclu6DNeK q1wPbsiIDYsenNItrLkSB+5F5f/DEV1pvqRO+vboHgchDfnlBRgLR5GrAmYoezQ= X-Google-Smtp-Source: AGHT+IGiXX7xYblF95Y0pLocqNpiSr/Q/4JP/oWwbHuP0ZOtATYS2MG3NDynvru/8NNBZ6WEwg+mjw== X-Received: by 2002:a05:6402:40d4:b0:5d0:e73c:b7f0 with SMTP id 4fb4d7f45d1cf-5d63c405fbbmr42872571a12.28.1734445861179; Tue, 17 Dec 2024 06:31:01 -0800 (PST) Original-Received: from pro2 (p200300e0b70d29009cfd954400434498.dip0.t-ipconnect.de. [2003:e0:b70d:2900:9cfd:9544:43:4498]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5d652f35b5bsm4339949a12.89.2024.12.17.06.31.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Dec 2024 06:31:00 -0800 (PST) In-Reply-To: ("Gerd =?utf-8?Q?M=C3=B6llmann=22'?= =?utf-8?Q?s?= message of "Tue, 17 Dec 2024 15:20:50 +0100") Received-SPF: pass client-ip=2a00:1450:4864:20::534; envelope-from=gerd.moellmann@gmail.com; helo=mail-ed1-x534.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.devel:326598 Archived-At: --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Gerd M=C3=B6llmann writes: > I think check_comp_unit_relocs should be removed in the branch. What's > left of it the branch, checks in master if everything has been > put in purespace which should be there. IIUC correctly, of course. Patch attached. --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-Remove-check_comp_unit_relocs.patch >From 66e73f65966e40af67338cfdf18f89549d687935 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gerd=20M=C3=B6llmann?= Date: Tue, 17 Dec 2024 15:28:14 +0100 Subject: [PATCH] Remove check_comp_unit_relocs * src/comp.c (check_comp_unit_relocs): Removed. (load_comp_unit): Remove use. --- src/comp.c | 27 --------------------------- 1 file changed, 27 deletions(-) diff --git a/src/comp.c b/src/comp.c index f91f7c57f45..2c7f2b704f6 100644 --- a/src/comp.c +++ b/src/comp.c @@ -5164,32 +5164,6 @@ load_static_obj (struct Lisp_Native_Comp_Unit *comp_u, const char *name) } -/* Return false when something is wrong or true otherwise. */ - -static bool -check_comp_unit_relocs (struct Lisp_Native_Comp_Unit *comp_u) -{ - dynlib_handle_ptr handle = comp_u->handle; - Lisp_Object *data_relocs = dynlib_sym (handle, DATA_RELOC_SYM); - - EMACS_INT d_vec_len = XFIXNUM (Flength (comp_u->data_vec)); - - for (ptrdiff_t i = 0; i < d_vec_len; i++) - { - Lisp_Object x = data_relocs[i]; - if (EQ (x, Qlambda_fixup)) - return false; - else if (NATIVE_COMP_FUNCTIONP (x)) - { - if (NILP (Fgethash (x, comp_u->lambda_gc_guard_h, Qnil))) - return false; - } - else if (!EQ (x, AREF (comp_u->data_vec, i))) - return false; - } - return true; -} - static void unset_cu_load_ongoing (Lisp_Object comp_u) { @@ -5319,7 +5293,6 @@ load_comp_unit (struct Lisp_Native_Comp_Unit *comp_u, bool loading_dump, /* Make sure data_ephemeral_vec still exists after top_level_run has run. Guard against sibling call optimization (or any other). */ data_ephemeral_vec = data_ephemeral_vec; - eassert (check_comp_unit_relocs (comp_u)); } if (!recursive_load) -- 2.47.1 --=-=-=--