File 0001-Revert-Fit-symbol_redirect-snugly-in-two-b... of Package emacs

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-Revert-Fit-symbol_redirect-snugly-in-two-bits.patch of Package emacs (Revision 557acbab4d584db113dad7e259a9b19f)

Currently displaying revision 557acbab4d584db113dad7e259a9b19f , Show latest

From e9df3086ccdd7b61a0d6c4f670650539546faca9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Bidar?= <bjorn.bidar@thaodan.de>
Date: Sun, 25 Jun 2023 00:56:01 +0300
Subject: [PATCH] Revert "Fit symbol_redirect snugly in two bits"

This reverts commit 3c8167ec0f9647e6fc33e65b0a0324f96cb795ee.
---
 src/lisp.h    | 36 ++++++++++++++++++++++--------------
 src/pdumper.c |  4 ++--
 2 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/src/lisp.h b/src/lisp.h
index 2978de962d9..de555e88808 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -812,24 +812,24 @@ #define XUNTAG(a, type, ctype) ((ctype *) \
 
 enum symbol_interned
 {
-  SYMBOL_UNINTERNED,		      /* not interned anywhere */
-  SYMBOL_INTERNED,		      /* interned but not in initial obarray */
-  SYMBOL_INTERNED_IN_INITIAL_OBARRAY  /* interned in initial obarray */
+  SYMBOL_UNINTERNED = 0,
+  SYMBOL_INTERNED = 1,
+  SYMBOL_INTERNED_IN_INITIAL_OBARRAY = 2
 };
 
 enum symbol_redirect
 {
-  SYMBOL_PLAINVAL,   /* plain var, value is in the `value' field */
-  SYMBOL_VARALIAS,   /* var alias, value is really in the `alias' symbol */
-  SYMBOL_LOCALIZED,  /* localized var, value is in the `blv' object */
-  SYMBOL_FORWARDED   /* forwarding var, value is in `forward' */
+  SYMBOL_PLAINVAL  = 4,
+  SYMBOL_VARALIAS  = 1,
+  SYMBOL_LOCALIZED = 2,
+  SYMBOL_FORWARDED = 3
 };
 
 enum symbol_trapped_write
 {
-  SYMBOL_UNTRAPPED_WRITE,  /* normal case, just set the value */
-  SYMBOL_NOWRITE,          /* constant, cannot set, e.g. nil, t, :keyword */
-  SYMBOL_TRAPPED_WRITE     /* trap the write, call watcher functions */
+  SYMBOL_UNTRAPPED_WRITE = 0,
+  SYMBOL_NOWRITE = 1,
+  SYMBOL_TRAPPED_WRITE = 2
 };
 
 struct Lisp_Symbol
@@ -840,13 +840,21 @@ #define XUNTAG(a, type, ctype) ((ctype *) \
     {
       bool_bf gcmarkbit : 1;
 
-      /* Indicates where the value can be found.  */
-      ENUM_BF (symbol_redirect) redirect : 2;
+      /* Indicates where the value can be found:
+	 0 : it's a plain var, the value is in the `value' field.
+	 1 : it's a varalias, the value is really in the `alias' symbol.
+	 2 : it's a localized var, the value is in the `blv' object.
+	 3 : it's a forwarding variable, the value is in `forward'.  */
+      ENUM_BF (symbol_redirect) redirect : 3;
 
+      /* 0 : normal case, just set the value
+	 1 : constant, cannot set, e.g. nil, t, :keywords.
+	 2 : trap the write, call watcher functions.  */
       ENUM_BF (symbol_trapped_write) trapped_write : 2;
 
-      /* Interned state of the symbol.  */
-      ENUM_BF (symbol_interned) interned : 2;
+      /* Interned state of the symbol.  This is an enumerator from
+	 enum symbol_interned.  */
+      unsigned interned : 2;
 
       /* True means that this variable has been explicitly declared
 	 special (with `defvar' etc), and shouldn't be lexically bound.  */
diff --git a/src/pdumper.c b/src/pdumper.c
index 34998549cc8..80f6bff25a6 100644
--- a/src/pdumper.c
+++ b/src/pdumper.c
@@ -2458,10 +2458,10 @@ dump_symbol (struct dump_context *ctx,
              Lisp_Object object,
              dump_off offset)
 {
-#if CHECK_STRUCTS && !defined HASH_Lisp_Symbol_61B174C9F4
+#if CHECK_STRUCTS && !defined HASH_Lisp_Symbol_999DC26DEC
 # error "Lisp_Symbol changed. See CHECK_STRUCTS comment in config.h."
 #endif
-#if CHECK_STRUCTS && !defined (HASH_symbol_redirect_EA72E4BFF5)
+#if CHECK_STRUCTS && !defined (HASH_symbol_redirect_ADB4F5B113)
 # error "symbol_redirect changed. See CHECK_STRUCTS comment in config.h."
 #endif
 
-- 
2.40.0

Places

File 0001-Revert-Fit-symbol_redirect-snugly-in-two-bits.patch of Package emacs (Revision 557acbab4d584db113dad7e259a9b19f)

Places