From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Matt Armstrong Newsgroups: gmane.emacs.bugs Subject: bug#59137: [PATCH] To minor changes related to overlays Date: Tue, 29 Nov 2022 15:16:16 -0800 Message-ID: <87h6yhpd1b.fsf@rfc20.org> References: <87edudm43j.fsf@rfc20.org> <834jv7rt5p.fsf@gnu.org> <87edu46r4z.fsf@rfc20.org> <87k03hpkwh.fsf@rfc20.org> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="7878"; mail-complaints-to="usenet@ciao.gmane.io" Cc: Eli Zaretskii , 59137@debbugs.gnu.org To: Stefan Kangas , Stefan Monnier Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Wed Nov 30 00:17:17 2022 Return-path: Envelope-to: geb-bug-gnu-emacs@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 1p09qm-0001mx-Jr for geb-bug-gnu-emacs@m.gmane-mx.org; Wed, 30 Nov 2022 00:17:16 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p09qZ-0003zG-JT; Tue, 29 Nov 2022 18:17:03 -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 1p09qY-0003z3-QP for bug-gnu-emacs@gnu.org; Tue, 29 Nov 2022 18:17:02 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p09qY-0005Yj-EK for bug-gnu-emacs@gnu.org; Tue, 29 Nov 2022 18:17:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p09qY-0004Tr-4A for bug-gnu-emacs@gnu.org; Tue, 29 Nov 2022 18:17:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Matt Armstrong Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 29 Nov 2022 23:17:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 59137 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 59137-submit@debbugs.gnu.org id=B59137.166976379217210 (code B ref 59137); Tue, 29 Nov 2022 23:17:02 +0000 Original-Received: (at 59137) by debbugs.gnu.org; 29 Nov 2022 23:16:32 +0000 Original-Received: from localhost ([127.0.0.1]:57081 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p09q3-0004TW-IH for submit@debbugs.gnu.org; Tue, 29 Nov 2022 18:16:31 -0500 Original-Received: from relay5-d.mail.gandi.net ([217.70.183.197]:54077) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p09py-0004TQ-JL for 59137@debbugs.gnu.org; Tue, 29 Nov 2022 18:16:30 -0500 Original-Received: (Authenticated sender: matt@rfc20.org) by mail.gandi.net (Postfix) with ESMTPSA id 7AAE61C0002; Tue, 29 Nov 2022 23:16:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rfc20.org; s=gm1; t=1669763780; 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: in-reply-to:in-reply-to:references:references; bh=B8P17KEU5GNA26XAESLvXxZ/WKUe8WPslHPI7SgrbWU=; b=XY+x3/yWX1F7ON2mBzSxPMAiGMpKwxYI0PuC+lDe4MZ97aNlEvTaEtAjsSiBk7jpa5gPD6 WXcD1lzVvfyL7PPyG8ZNZr5vSl+66aEDCASsf8EvVvxyUUepDmDwnemanCEf7pp3qwwZrS wpnHmOAOSvw/unnqytwnXaQxfmKx2VBhkwYsbc1SW/3x8MvW/cDvRKBwLzr01tSuIH+jrQ puYoSxl01kaD1DXlajdqFcPjdAo6cmNI8O+9CO4FY7oyigThabCdT96vaCv2TZDyuuCJyf UbeMyHnM6weFkFc4SZcSkGXF+RK9dNB28Ce0Wm3xNBDXwM7BhPbMEX0uQrXDhQ== Original-Received: by mac-mini.lan (Postfix) with ESMTPS id 52B423C991; Tue, 29 Nov 2022 15:16:16 -0800 (PST) Original-Received: by naz.lan (Postfix, from userid 1000) id 3636443D6886; Tue, 29 Nov 2022 15:16:16 -0800 (PST) In-Reply-To: X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:249453 Archived-At: Stefan Kangas writes: > Matt Armstrong writes: > >> Attached is the rebased patch for the new helper function (it didn't >> change much if at all). As Stefan suggested, the patch for the iterator >> is no longer relevant. > > Thanks. > >> From 3e2c4cd143d51c66198dd606e18015eeae42f3ec Mon Sep 17 00:00:00 2001 >> From: Matt Armstrong >> Date: Tue, 8 Nov 2022 15:00:18 -0800 >> Subject: [PATCH] Add itree_empty_p for clarity and reduced coupling >> >> * src/itree.h (itree_empty_p): New predicate. >> * src/buffer.h (buffer_has_overlays): Call it. >> * src/pdumper.c (dump_buffer): ditto. >> * src/alloc.c (mark_buffer): ditto. Thanks for the tips. > Equivalently, you can leave out "ditto" so the above is just the below > (I added the bug number too, according to our conventions): > > * src/itree.h (itree_empty_p): New predicate. > * src/buffer.h (buffer_has_overlays): > * src/pdumper.c (dump_buffer): > * src/alloc.c (mark_buffer): Call it. (Bug#59137) > >> --- >> src/alloc.c | 2 +- >> src/buffer.h | 3 +-- >> src/itree.h | 9 +++++++++ >> src/pdumper.c | 2 +- >> 4 files changed, 12 insertions(+), 4 deletions(-) >> >> diff --git a/src/alloc.c b/src/alloc.c >> index 0653f2e0cc..526a25393f 100644 >> --- a/src/alloc.c >> +++ b/src/alloc.c >> @@ -6553,7 +6553,7 @@ mark_buffer (struct buffer *buffer) >> if (!BUFFER_LIVE_P (buffer)) >> mark_object (BVAR (buffer, undo_list)); >> >> - if (buffer->overlays) >> + if (!itree_empty_p (buffer->overlays)) >> mark_overlays (buffer->overlays->root); > > I'm not familiar with this code at all, but I note that the condition > here changes from: > > buffer->overlays > > to > > buffer->overlays && buffer->overlays->root > > Is that correct? Unless I missed something, the patch description > doesn't say anything about it. The admittedly redundant NULL check done by itree_empty_p does not change semantics or cause harm. mark_overlays in alloc.c is a recursive function so it handles NULL itself, hence the NULL check was omitted in the original code.