From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Spencer Baugh Newsgroups: gmane.emacs.bugs Subject: bug#48264: [PATCH v3 13/15] Assert that PER_BUFFER_IDX for Lisp variables is not 0 Date: Thu, 6 May 2021 17:33:44 -0400 Message-ID: <20210506213346.9730-14-sbaugh@catern.com> References: <877dkbsj9d.fsf@catern.com> Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="4393"; mail-complaints-to="usenet@ciao.gmane.io" Cc: Spencer Baugh To: 48264@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Thu May 06 23:36:06 2021 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 1lelfB-00010F-1d for geb-bug-gnu-emacs@m.gmane-mx.org; Thu, 06 May 2021 23:36:05 +0200 Original-Received: from localhost ([::1]:35182 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lelfA-0006kP-04 for geb-bug-gnu-emacs@m.gmane-mx.org; Thu, 06 May 2021 17:36:04 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:45586) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1leleC-0006VP-Ql for bug-gnu-emacs@gnu.org; Thu, 06 May 2021 17:35:05 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:56586) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1leleC-0002Qr-II for bug-gnu-emacs@gnu.org; Thu, 06 May 2021 17:35:04 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1leleC-0000Eo-GH for bug-gnu-emacs@gnu.org; Thu, 06 May 2021 17:35:04 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Spencer Baugh Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 06 May 2021 21:35:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48264 X-GNU-PR-Package: emacs Original-Received: via spool by 48264-submit@debbugs.gnu.org id=B48264.1620336854833 (code B ref 48264); Thu, 06 May 2021 21:35:04 +0000 Original-Received: (at 48264) by debbugs.gnu.org; 6 May 2021 21:34:14 +0000 Original-Received: from localhost ([127.0.0.1]:39885 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1leldN-0000DH-TL for submit@debbugs.gnu.org; Thu, 06 May 2021 17:34:14 -0400 Original-Received: from venus.catern.com ([68.183.49.163]:41534) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1leldE-0000B5-BL for 48264@debbugs.gnu.org; Thu, 06 May 2021 17:34:05 -0400 Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=98.7.229.235; helo=localhost; envelope-from=sbaugh@catern.com; receiver= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=catern.com; s=mail; t=1620336844; bh=rVvbw9Uob92bI+iHJCKOqBT/MzgHOqHU60lVfVGdSwk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Fy57ZqkjM6YikGszjlNElHyyS2K2KXdfDoglgBFo/wOyuSJ4t5WITh8VJphmXvcT2 6yymJZhjjMZqL5QP08Tpnworw5YquoKDDV6QnDUo1dgKO2bkUtzMsEAp+pwCoLRUpw SM8fA1CwwPFaJ+5dFwfyJaVWw/elU7nyYtEdgfJY= Original-Received: from localhost (cpe-98-7-229-235.nyc.res.rr.com [98.7.229.235]) by venus.catern.com (Postfix) with ESMTPSA id 0A30A2E9669; Thu, 6 May 2021 21:34:04 +0000 (UTC) X-Mailer: git-send-email 2.31.1 In-Reply-To: <877dkbsj9d.fsf@catern.com> 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" Xref: news.gmane.io gmane.emacs.bugs:205888 Archived-At: PER_BUFFER_IDX can't be 0 for Lisp variables - so this if-check was always pointless. * src/data.c (default_value): Change if to eassert --- src/data.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/data.c b/src/data.c index 49a4bc3bea..4e58c6c815 100644 --- a/src/data.c +++ b/src/data.c @@ -1758,8 +1758,8 @@ default_value (Lisp_Object symbol) if (BUFFER_OBJFWDP (valcontents)) { int offset = XBUFFER_OBJFWD (valcontents)->offset; - if (PER_BUFFER_IDX (offset) != 0) - return per_buffer_default (offset); + eassert (PER_BUFFER_IDX (offset) != 0); + return per_buffer_default (offset); } /* For other variables, get the current value. */ -- 2.31.1