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 6/7] Assert that PER_BUFFER_IDX for Lisp variables is not 0 Date: Tue, 23 Mar 2021 23:11:56 -0400 Message-ID: References: Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="29748"; mail-complaints-to="usenet@ciao.gmane.io" Cc: Spencer Baugh , Eli Zaretskii , Stefan Monnier To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Wed Mar 24 04:18:52 2021 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 1lOu2l-0007ej-Tp for ged-emacs-devel@m.gmane-mx.org; Wed, 24 Mar 2021 04:18:51 +0100 Original-Received: from localhost ([::1]:33698 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lOu2k-0004xb-W5 for ged-emacs-devel@m.gmane-mx.org; Tue, 23 Mar 2021 23:18:51 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:58776) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lOtwQ-0006Bb-TY for emacs-devel@gnu.org; Tue, 23 Mar 2021 23:12:18 -0400 Original-Received: from venus.catern.com ([68.183.49.163]:45440) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lOtwO-0000lb-Up; Tue, 23 Mar 2021 23:12:18 -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=1616555530; bh=D4GgU0w/xYlcT4tLvdWa5HkYDX2OhnrMAf/anW6rgOs=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=G5bUm4FWbIm/CebTDUh39VkTVmnajYFynzuQA+ijHWMJ3pflhRCUbL0f22hdk1vm1 uB7JzPCA+LrK9AnNm8bUEcKrSZena2W2eYO6sw62G+Z7cNtA4zOABtOp6605l5gG11 7a72VV3MMajw+LgeK/7MzkTaeNnc+Tn3PbR9vyKQ= 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 6354F2E66FE; Wed, 24 Mar 2021 03:12:10 +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:266913 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 0fa491b17a..2de76099ca 100644 --- a/src/data.c +++ b/src/data.c @@ -1709,8 +1709,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