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.devel Subject: [PATCH v2 11/16] Assert that PER_BUFFER_IDX for Lisp variables is not 0 Date: Sat, 21 Nov 2020 21:34:40 -0500 Message-ID: <866ba2c65c72e6344c511c8e92fc3f0150bbf8f7.1606009917.git.sbaugh@catern.com> References: <20201119153814.17541-1-sbaugh@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="5776"; mail-complaints-to="usenet@ciao.gmane.io" Cc: Spencer Baugh , Arnold Noronha , Stefan Monnier , Dmitry Gutov To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Sun Nov 22 03:44:10 2020 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 1kgfMH-0001PX-H7 for ged-emacs-devel@m.gmane-mx.org; Sun, 22 Nov 2020 03:44:09 +0100 Original-Received: from localhost ([::1]:36540 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kgfMG-00036x-I2 for ged-emacs-devel@m.gmane-mx.org; Sat, 21 Nov 2020 21:44:08 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:41082) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kgfDX-0000ev-R6 for emacs-devel@gnu.org; Sat, 21 Nov 2020 21:35:08 -0500 Original-Received: from venus.catern.com ([68.183.49.163]:60174) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kgfDT-0007JY-QK for emacs-devel@gnu.org; Sat, 21 Nov 2020 21:35:07 -0500 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=1606012493; bh=f2nZV1zasIHnjuYhytrKtKu3zMTHDy9rRNxu2KHAR0Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=ly4hHIEyd9C+hhvnwlV2j3aT4UYY1a0SvIaGMVOxEHn4aLkinNS3AQ/gPYJZyMx3b kfd6FSzghvvp77JNzeVv07Qp4OKh7018dGfu8hAhEMDZ+lBJ2EiQWoZo+BrCJY0GPc Kp0WFRcTgXkBFMmQcHCIKenwVmXwAc9SQH8lqB3Q= 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 393102DDDD2; Sun, 22 Nov 2020 02:34:53 +0000 (UTC) X-Mailer: git-send-email 2.28.0 In-Reply-To: Received-SPF: pass client-ip=68.183.49.163; envelope-from=sbaugh@catern.com; helo=venus.catern.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, 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.23 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" Xref: news.gmane.io gmane.emacs.devel:259586 Archived-At: PER_BUFFER_IDX can't be 0 for Lisp variables - so this if-check was always pointless. --- src/data.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/data.c b/src/data.c index b7ad4ef1db..f472127599 100644 --- a/src/data.c +++ b/src/data.c @@ -1626,8 +1626,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.28.0