Package: emacs;
Reported by: Spencer Baugh <sbaugh <at> catern.com>
Date: Thu, 6 May 2021 20:25:01 UTC
Severity: normal
Found in version 28.0.50
View this message in rfc822 format
From: Spencer Baugh <sbaugh <at> catern.com> To: 48264 <at> debbugs.gnu.org Cc: Spencer Baugh <sbaugh <at> catern.com> Subject: bug#48264: [PATCH v3 14/15] Remove PER_BUFFER_IDX and buffer_local_flags Date: Thu, 6 May 2021 17:33:45 -0400
Previously, we maintained an "index" starting at 1 for each BVAR with
a default value, stored in buffer_local_flags; it was used to index
into local_flags.
After previous commits, we don't need this index for anything anymore.
So we can delete it.
* src/buffer.h (buffer_local_flags, PER_BUFFER_VAR_IDX)
(valid_per_buffer_idx, PER_BUFFER_IDX): Delete.
(BUFFER_DEFAULT_VALUE_P): Remove usage of PER_BUFFER_IDX.
* src/buffer.c (buffer_local_flags, last_per_buffer_idx)
(valid_per_buffer_idx): Delete.
(init_buffer_once): Don't initialize buffer_local_flags.
(defvar_per_buffer): Remove usage of PER_BUFFER_IDX.
* src/buffer.h (BUFFER_DEFAULT_VALUE_P):
* src/data.c (default_value): Remove usage of PER_BUFFER_IDX.
---
src/buffer.c | 172 ---------------------------------------------------
src/buffer.h | 53 ----------------
src/data.c | 1 -
3 files changed, 226 deletions(-)
diff --git a/src/buffer.c b/src/buffer.c
index 097d03690a..abf112a898 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -59,25 +59,6 @@ along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. */
struct buffer buffer_defaults;
-/* This structure marks which slots in a buffer have corresponding
- default values in buffer_defaults.
- Each such slot has a value in this structure.
- The value is a positive Lisp integer that must be smaller than
- MAX_PER_BUFFER_VARS.
-
- When a buffer has its own local value for a slot,
- the entry for that slot (found in the same slot in this structure)
- is turned on in the buffer's local_flags array.
-
- If a slot in this structure is -1, then even though there may
- be a DEFVAR_PER_BUFFER for the slot, there is no default value for it;
- and the corresponding slot in buffer_defaults is not used.
-
- If a slot in this structure corresponding to a DEFVAR_PER_BUFFER is
- zero, that is a bug. */
-
-struct buffer buffer_local_flags;
-
/* This structure holds the names of symbols whose values may be
buffer-local. It is indexed and accessed in the same way as the above. */
@@ -94,10 +75,6 @@ struct buffer buffer_local_symbols;
((ptrdiff_t) min (MOST_POSITIVE_FIXNUM, \
min (PTRDIFF_MAX, SIZE_MAX) / word_size))
-/* Number of per-buffer variables used. */
-
-static int last_per_buffer_idx;
-
static void call_overlay_mod_hooks (Lisp_Object list, Lisp_Object overlay,
bool after, Lisp_Object arg1,
Lisp_Object arg2, Lisp_Object arg3);
@@ -328,11 +305,6 @@ bset_right_fringe_width (struct buffer *b, Lisp_Object val)
b->right_fringe_width_ = val;
}
static void
-bset_save_length (struct buffer *b, Lisp_Object val)
-{
- b->save_length_ = val;
-}
-static void
bset_scroll_bar_width (struct buffer *b, Lisp_Object val)
{
b->scroll_bar_width_ = val;
@@ -679,12 +651,6 @@ set_buffer_overlays_after (struct buffer *b, struct Lisp_Overlay *o)
b->overlays_after = o;
}
-bool
-valid_per_buffer_idx (int idx)
-{
- return 0 <= idx && idx < last_per_buffer_idx;
-}
-
/* Clone per-buffer values of buffer FROM.
Buffer TO gets the same per-buffer values as FROM, with the
@@ -5123,131 +5089,6 @@ free_buffer_text (struct buffer *b)
void
init_buffer_once (void)
{
- /* TODO: clean up the buffer-local machinery. Right now,
- we have:
-
- buffer_defaults: default values of buffer-locals
- buffer_local_flags: metadata
- buffer_local_symbols: metadata
-
- There must be a simpler way to store the metadata.
- */
-
- int idx;
-
- /* 0 means not a lisp var, -1 means always local, else mask. */
- memset (&buffer_local_flags, 0, sizeof buffer_local_flags);
- bset_filename (&buffer_local_flags, make_fixnum (-1));
- bset_directory (&buffer_local_flags, make_fixnum (-1));
- bset_backed_up (&buffer_local_flags, make_fixnum (-1));
- bset_save_length (&buffer_local_flags, make_fixnum (-1));
- bset_auto_save_file_name (&buffer_local_flags, make_fixnum (-1));
- bset_read_only (&buffer_local_flags, make_fixnum (-1));
- bset_major_mode (&buffer_local_flags, make_fixnum (-1));
- bset_local_minor_modes (&buffer_local_flags, make_fixnum (-1));
- bset_mode_name (&buffer_local_flags, make_fixnum (-1));
- bset_undo_list (&buffer_local_flags, make_fixnum (-1));
- bset_mark_active (&buffer_local_flags, make_fixnum (-1));
- bset_point_before_scroll (&buffer_local_flags, make_fixnum (-1));
- bset_file_truename (&buffer_local_flags, make_fixnum (-1));
- bset_invisibility_spec (&buffer_local_flags, make_fixnum (-1));
- bset_file_format (&buffer_local_flags, make_fixnum (-1));
- bset_auto_save_file_format (&buffer_local_flags, make_fixnum (-1));
- bset_display_count (&buffer_local_flags, make_fixnum (-1));
- bset_display_time (&buffer_local_flags, make_fixnum (-1));
- bset_enable_multibyte_characters (&buffer_local_flags, make_fixnum (-1));
-
- /* These used to be stuck at 0 by default, but now that the all-zero value
- means Qnil, we have to initialize them explicitly. */
- bset_name (&buffer_local_flags, make_fixnum (0));
- bset_mark (&buffer_local_flags, make_fixnum (0));
- bset_local_var_alist (&buffer_local_flags, make_fixnum (0));
- bset_keymap (&buffer_local_flags, make_fixnum (0));
- bset_downcase_table (&buffer_local_flags, make_fixnum (0));
- bset_upcase_table (&buffer_local_flags, make_fixnum (0));
- bset_case_canon_table (&buffer_local_flags, make_fixnum (0));
- bset_case_eqv_table (&buffer_local_flags, make_fixnum (0));
- bset_width_table (&buffer_local_flags, make_fixnum (0));
- bset_pt_marker (&buffer_local_flags, make_fixnum (0));
- bset_begv_marker (&buffer_local_flags, make_fixnum (0));
- bset_zv_marker (&buffer_local_flags, make_fixnum (0));
- bset_last_selected_window (&buffer_local_flags, make_fixnum (0));
-
- idx = 1;
- XSETFASTINT (BVAR (&buffer_local_flags, mode_line_format), idx); ++idx;
- XSETFASTINT (BVAR (&buffer_local_flags, abbrev_mode), idx); ++idx;
- XSETFASTINT (BVAR (&buffer_local_flags, overwrite_mode), idx); ++idx;
- XSETFASTINT (BVAR (&buffer_local_flags, case_fold_search), idx); ++idx;
- XSETFASTINT (BVAR (&buffer_local_flags, auto_fill_function), idx); ++idx;
- XSETFASTINT (BVAR (&buffer_local_flags, selective_display), idx); ++idx;
- XSETFASTINT (BVAR (&buffer_local_flags, selective_display_ellipses), idx); ++idx;
- XSETFASTINT (BVAR (&buffer_local_flags, tab_width), idx); ++idx;
- XSETFASTINT (BVAR (&buffer_local_flags, truncate_lines), idx); ++idx;
- XSETFASTINT (BVAR (&buffer_local_flags, word_wrap), idx); ++idx;
- XSETFASTINT (BVAR (&buffer_local_flags, ctl_arrow), idx); ++idx;
- XSETFASTINT (BVAR (&buffer_local_flags, fill_column), idx); ++idx;
- XSETFASTINT (BVAR (&buffer_local_flags, left_margin), idx); ++idx;
- XSETFASTINT (BVAR (&buffer_local_flags, abbrev_table), idx); ++idx;
- XSETFASTINT (BVAR (&buffer_local_flags, display_table), idx); ++idx;
- XSETFASTINT (BVAR (&buffer_local_flags, syntax_table), idx); ++idx;
- XSETFASTINT (BVAR (&buffer_local_flags, cache_long_scans), idx); ++idx;
- XSETFASTINT (BVAR (&buffer_local_flags, category_table), idx); ++idx;
- XSETFASTINT (BVAR (&buffer_local_flags, bidi_display_reordering), idx); ++idx;
- XSETFASTINT (BVAR (&buffer_local_flags, bidi_paragraph_direction), idx); ++idx;
- XSETFASTINT (BVAR (&buffer_local_flags, bidi_paragraph_separate_re), idx); ++idx;
- XSETFASTINT (BVAR (&buffer_local_flags, bidi_paragraph_start_re), idx); ++idx;
- XSETFASTINT (BVAR (&buffer_local_flags, buffer_file_coding_system), idx); ++idx;
- XSETFASTINT (BVAR (&buffer_local_flags, left_margin_cols), idx); ++idx;
- XSETFASTINT (BVAR (&buffer_local_flags, right_margin_cols), idx); ++idx;
- XSETFASTINT (BVAR (&buffer_local_flags, left_fringe_width), idx); ++idx;
- XSETFASTINT (BVAR (&buffer_local_flags, right_fringe_width), idx); ++idx;
- XSETFASTINT (BVAR (&buffer_local_flags, fringes_outside_margins), idx); ++idx;
- XSETFASTINT (BVAR (&buffer_local_flags, scroll_bar_width), idx); ++idx;
- XSETFASTINT (BVAR (&buffer_local_flags, scroll_bar_height), idx); ++idx;
- XSETFASTINT (BVAR (&buffer_local_flags, vertical_scroll_bar_type), idx); ++idx;
- XSETFASTINT (BVAR (&buffer_local_flags, horizontal_scroll_bar_type), idx); ++idx;
- XSETFASTINT (BVAR (&buffer_local_flags, indicate_empty_lines), idx); ++idx;
- XSETFASTINT (BVAR (&buffer_local_flags, indicate_buffer_boundaries), idx); ++idx;
- XSETFASTINT (BVAR (&buffer_local_flags, fringe_indicator_alist), idx); ++idx;
- XSETFASTINT (BVAR (&buffer_local_flags, fringe_cursor_alist), idx); ++idx;
- XSETFASTINT (BVAR (&buffer_local_flags, scroll_up_aggressively), idx); ++idx;
- XSETFASTINT (BVAR (&buffer_local_flags, scroll_down_aggressively), idx); ++idx;
- XSETFASTINT (BVAR (&buffer_local_flags, header_line_format), idx); ++idx;
- XSETFASTINT (BVAR (&buffer_local_flags, tab_line_format), idx); ++idx;
- XSETFASTINT (BVAR (&buffer_local_flags, cursor_type), idx); ++idx;
- XSETFASTINT (BVAR (&buffer_local_flags, extra_line_spacing), idx); ++idx;
- XSETFASTINT (BVAR (&buffer_local_flags, cursor_in_non_selected_windows), idx); ++idx;
-
- /* buffer_local_flags contains no pointers, so it's safe to treat it
- as a blob for pdumper. */
- PDUMPER_REMEMBER_SCALAR (buffer_local_flags);
-
- /* Need more room? */
- if (idx >= MAX_PER_BUFFER_VARS)
- emacs_abort ();
- last_per_buffer_idx = idx;
- PDUMPER_REMEMBER_SCALAR (last_per_buffer_idx);
-
- /* Make sure all markable slots in buffer_defaults
- are initialized reasonably, so mark_buffer won't choke. */
- reset_buffer (&buffer_defaults);
- eassert (NILP (BVAR (&buffer_defaults, name)));
- eassert (NILP (BVAR (&buffer_local_symbols, name)));
- reset_buffer (&buffer_local_symbols);
- /* Prevent GC from getting confused. */
- buffer_defaults.text = &buffer_defaults.own_text;
- buffer_local_symbols.text = &buffer_local_symbols.own_text;
- /* No one will share the text with these buffers, but let's play it safe. */
- buffer_defaults.indirections = 0;
- buffer_local_symbols.indirections = 0;
- /* Likewise no one will display them. */
- buffer_defaults.window_count = 0;
- buffer_local_symbols.window_count = 0;
- set_buffer_intervals (&buffer_defaults, NULL);
- set_buffer_intervals (&buffer_local_symbols, NULL);
- /* This is not strictly necessary, but let's make them initialized. */
- bset_name (&buffer_defaults, build_pure_c_string (" *buffer-defaults*"));
- bset_name (&buffer_local_symbols, build_pure_c_string (" *buffer-local-symbols*"));
BUFFER_PVEC_INIT (&buffer_defaults);
BUFFER_PVEC_INIT (&buffer_local_symbols);
@@ -5308,14 +5149,6 @@ init_buffer_once (void)
bset_scroll_up_aggressively (&buffer_defaults, Qnil);
bset_scroll_down_aggressively (&buffer_defaults, Qnil);
- /* Assign the local-flags to the slots that have default values.
- The local flag is a bit that is used in the buffer
- to say that it has its own local value for the slot.
- The local flag bits are in the local_var_flags slot of the buffer. */
-
- /* Nothing can work if this isn't true. */
- { verify (sizeof (EMACS_INT) == word_size); }
-
Vbuffer_alist = Qnil;
current_buffer = 0;
pdumper_remember_lv_ptr_raw (¤t_buffer, Lisp_Vectorlike);
@@ -5479,11 +5312,6 @@ defvar_per_buffer (struct Lisp_Buffer_Objfwd *bo_fwd, const char *namestring,
sym->u.s.redirect = SYMBOL_FORWARDED;
SET_SYMBOL_FWD (sym, bo_fwd);
XSETSYMBOL (PER_BUFFER_SYMBOL (offset), sym);
-
- if (PER_BUFFER_IDX (offset) == 0)
- /* Did a DEFVAR_PER_BUFFER without initializing the corresponding
- slot of buffer_local_flags. */
- emacs_abort ();
}
diff --git a/src/buffer.h b/src/buffer.h
index fc67b220e4..c765ea4347 100644
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -1107,22 +1107,6 @@ BUFFER_CHECK_INDIRECTION (struct buffer *b)
extern struct buffer buffer_defaults;
-/* This structure marks which slots in a buffer have corresponding
- default values in buffer_defaults.
- Each such slot has a nonzero value in this structure.
- The value has only one nonzero bit.
-
- When a buffer has its own local value for a slot,
- the entry for that slot (found in the same slot in this structure)
- is turned on in the buffer's local_flags array.
-
- If a slot in this structure is zero, then even though there may
- be a Lisp-level local variable for the slot, it has no default value,
- and the corresponding slot in buffer_defaults is not used. */
-
-
-extern struct buffer buffer_local_flags;
-
/* For each buffer slot, this points to the Lisp symbol name
for that slot in the current buffer. It is 0 for slots
that don't have such names. */
@@ -1401,43 +1385,6 @@ OVERLAY_POSITION (Lisp_Object p)
offset <= PER_BUFFER_VAR_OFFSET (cursor_in_non_selected_windows); \
offset += word_size)
-/* Return the index of buffer-local variable VAR. Each per-buffer
- variable has an index > 0 associated with it, except when it always
- has buffer-local values, in which case the index is -1. If this is
- 0, this is a bug and means that the slot of VAR in
- buffer_local_flags wasn't initialized. */
-
-#define PER_BUFFER_VAR_IDX(VAR) \
- PER_BUFFER_IDX (PER_BUFFER_VAR_OFFSET (VAR))
-
-extern bool valid_per_buffer_idx (int);
-
-/* Return the index value of the per-buffer variable at offset OFFSET
- in the buffer structure.
-
- If the slot OFFSET has a corresponding default value in
- buffer_defaults, the index value is positive and has only one
- nonzero bit. When a buffer has its own local value for a slot, the
- bit for that slot (found in the same slot in this structure) is
- turned on in the buffer's local_flags array.
-
- If the index value is -1, even though there may be a
- DEFVAR_PER_BUFFER for the slot, there is no default value for it;
- and the corresponding slot in buffer_defaults is not used.
-
- If the index value is -2, then there is no DEFVAR_PER_BUFFER for
- the slot, but there is a default value which is copied into each
- new buffer.
-
- If a slot in this structure corresponding to a DEFVAR_PER_BUFFER is
- zero, that is a bug. */
-
-INLINE int
-PER_BUFFER_IDX (ptrdiff_t offset)
-{
- return XFIXNUM (*(Lisp_Object *) (offset + (char *) &buffer_local_flags));
-}
-
/* Functions to get and set default value of the per-buffer
variable at offset OFFSET in the buffer structure. */
diff --git a/src/data.c b/src/data.c
index 4e58c6c815..9e38a68817 100644
--- a/src/data.c
+++ b/src/data.c
@@ -1758,7 +1758,6 @@ default_value (Lisp_Object symbol)
if (BUFFER_OBJFWDP (valcontents))
{
int offset = XBUFFER_OBJFWD (valcontents)->offset;
- eassert (PER_BUFFER_IDX (offset) != 0);
return per_buffer_default (offset);
}
--
2.31.1
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.