Remove struct Lisp_Objfwd

* src/lisp.h (struct Lisp_Objfwd): Deleted.
(struct Lisp_Fwd): Replace it with objvar field.
(DEFVAR_LISP, DEFVAR_LISP_NOPRO, DEFVAR_LISP_NOPROX): Use the field.
* src/lread.c (defvar_lisp): Updated as needed.
* src/pdumper.c (dump_field_fwd): Use the field.
* src/data.c (XOBJVAR): Renamed and updated from XOBJFWD.
(do_symval_forwarding, store_symval_forwarding): Use it.

4 files changed, 20 insertions, 29 deletions

diff --git a/src/data.c b/src/data.c
index e33f4c92d35..337d640b2b5 100644
--- a/src/data.c
+++ b/src/data.c
@@ -71,11 +71,11 @@ XINTVAR (lispfwd a)
   eassert (INTFWDP (a));
   return a->u.intvar;
 }
-static struct Lisp_Objfwd const *
-XOBJFWD (lispfwd a)
+static Lisp_Object *
+XOBJVAR (lispfwd a)
 {
   eassert (OBJFWDP (a));
-  return &a->u.objfwd;
+  return a->u.objvar;
 }
 
 static void
@@ -1338,7 +1338,7 @@ do_symval_forwarding (lispfwd valcontents)
       return (*XBOOLVAR (valcontents) ? Qt : Qnil);
 
     case Lisp_Fwd_Obj:
-      return *XOBJFWD (valcontents)->objvar;
+      return *XOBJVAR (valcontents);
 
     case Lisp_Fwd_Buffer_Obj:
       return per_buffer_value (current_buffer,
@@ -1427,16 +1427,16 @@ store_symval_forwarding (lispfwd valcontents, Lisp_Object newval,
       break;
 
     case Lisp_Fwd_Obj:
-      *XOBJFWD (valcontents)->objvar = newval;
+      *XOBJVAR (valcontents) = newval;
 
       /* If this variable is a default for something stored
          in the buffer itself, such as default-fill-column,
          find the buffers that don't have local values for it
          and update them.  */
-      if (XOBJFWD (valcontents)->objvar > (Lisp_Object *) &buffer_defaults
-          && XOBJFWD (valcontents)->objvar < (Lisp_Object *) (&buffer_defaults + 1))
+      if (XOBJVAR (valcontents) > (Lisp_Object *) &buffer_defaults
+          && XOBJVAR (valcontents) < (Lisp_Object *) (&buffer_defaults + 1))
         {
-          int offset = ((char *) XOBJFWD (valcontents)->objvar
+          int offset = ((char *) XOBJVAR (valcontents)
                         - (char *) &buffer_defaults);
           int idx = PER_BUFFER_IDX (offset);
 
diff --git a/src/lisp.h b/src/lisp.h
index 24bd20d1562..40556527d3a 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -3053,15 +3053,6 @@ make_uint (uintmax_t n)
   (EXPR_SIGNED (expr) ? make_int (expr) : make_uint (expr))
 
 
-/* Forwarding pointer to a Lisp_Object variable.
-   This is allowed only in the value cell of a symbol,
-   and it means that the symbol's value really lives in the
-   specified variable.  */
-struct Lisp_Objfwd
-  {
-    Lisp_Object *objvar;
-  };
-
 /* Like Lisp_Objfwd except that value lives in a slot in the
    current buffer.  Value is byte index of slot within buffer.  */
 struct Lisp_Buffer_Objfwd
@@ -3128,7 +3119,7 @@ struct Lisp_Fwd
   {
     intmax_t *intvar;
     bool *boolvar;
-    struct Lisp_Objfwd objfwd;
+    Lisp_Object *objvar;
     struct Lisp_Buffer_Objfwd bufobjfwd;
     struct Lisp_Kboard_Objfwd kboardobjfwd;
   } u;
@@ -3494,16 +3485,16 @@ extern void defvar_kboard (struct Lisp_Fwd const *, char const *);
    All C code uses the `cons_cells_consed' name.  This is all done
    this way to support indirection for multi-threaded Emacs.  */
 
-#define DEFVAR_LISP(lname, vname, doc)                          \
-  do {                                                          \
-    static struct Lisp_Fwd const o_fwd                          \
-      = {Lisp_Fwd_Obj, .u.objfwd = {&globals.f_##vname}};       \
-    defvar_lisp (&o_fwd, lname);                                \
+#define DEFVAR_LISP(lname, vname, doc)                  \
+  do {                                                  \
+    static struct Lisp_Fwd const o_fwd                  \
+      = {Lisp_Fwd_Obj, .u.objvar = &globals.f_##vname}; \
+    defvar_lisp (&o_fwd, lname);                        \
   } while (false)
 #define DEFVAR_LISP_NOPRO(lname, vname, doc)            \
   do {                                                  \
-  static struct Lisp_Fwd const o_fwd                    \
-    = {Lisp_Fwd_Obj, .u.objfwd = {&globals.f_##vname}}; \
+    static struct Lisp_Fwd const o_fwd                  \
+      = {Lisp_Fwd_Obj, .u.objvar = &globals.f_##vname}; \
     defvar_lisp_nopro (&o_fwd, lname);                  \
   } while (false)
 #define DEFVAR_BOOL(lname, vname, doc)                          \
diff --git a/src/lread.c b/src/lread.c
index f8c41bd80b8..9d91ac8909d 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -5282,7 +5282,7 @@ defvar_lisp (struct Lisp_Fwd const *o_fwd, char const *namestring)
 {
   eassert (o_fwd->type == Lisp_Fwd_Obj);
   defvar_lisp_nopro (o_fwd, namestring);
-  staticpro (o_fwd->u.objfwd.objvar);
+  staticpro (o_fwd->u.objvar);
 }
 
 /* Similar but define a variable whose value is the Lisp Object stored
diff --git a/src/pdumper.c b/src/pdumper.c
index d23eaa82696..c21af24d9f1 100644
--- a/src/pdumper.c
+++ b/src/pdumper.c
@@ -2321,10 +2321,10 @@ dump_field_fwd (struct dump_context *ctx, void *out, const void *in_start,
       return;
     case Lisp_Fwd_Obj:
       {
-        const struct Lisp_Objfwd *fwd =  &(*in_field)->u.objfwd;
-        if (NILP (Fgethash (dump_off_to_lisp (emacs_offset (fwd->objvar)),
+        const Lisp_Object *objvar =  (*in_field)->u.objvar;
+        if (NILP (Fgethash (dump_off_to_lisp (emacs_offset (objvar)),
                             ctx->staticpro_table, Qnil)))
-          dump_emacs_reloc_to_lv (ctx, fwd->objvar, *fwd->objvar);
+          dump_emacs_reloc_to_lv (ctx, objvar, *objvar);
       }
       return;
     case Lisp_Fwd_Kboard_Obj: