[Emacs-diffs] Changes to emacs/src/alloc.c

[Miles Bader]

Index: emacs/src/alloc.c
diff -c emacs/src/alloc.c:1.271 emacs/src/alloc.c:1.272
*** emacs/src/alloc.c:1.271     Fri Apr 26 19:39:05 2002
--- emacs/src/alloc.c   Mon May 20 04:04:52 2002
***************
*** 2545,2551 ****
      }
    
    p = XSYMBOL (val);
!   p->name = XSTRING (name);
    p->plist = Qnil;
    p->value = Qunbound;
    p->function = Qunbound;
--- 2545,2551 ----
      }
    
    p = XSYMBOL (val);
!   p->xname = name;
    p->plist = Qnil;
    p->value = Qunbound;
    p->function = Qunbound;
***************
*** 4690,4698 ****
        mark_object (&ptr->function);
        mark_object (&ptr->plist);
  
!       if (!PURE_POINTER_P (ptr->name))
!         MARK_STRING (ptr->name);
!       MARK_INTERVAL_TREE (ptr->name->intervals);
        
        /* Note that we do not mark the obarray of the symbol.
           It is safe not to do so because nothing accesses that
--- 4690,4698 ----
        mark_object (&ptr->function);
        mark_object (&ptr->plist);
  
!       if (!PURE_POINTER_P (XSTRING (ptr->xname)))
!         MARK_STRING (XSTRING (ptr->xname));
!       MARK_INTERVAL_TREE (XSTRING (ptr->xname)->intervals);
        
        /* Note that we do not mark the obarray of the symbol.
           It is safe not to do so because nothing accesses that
***************
*** 5163,5169 ****
            /* Check if the symbol was created during loadup.  In such a case
               it might be pointed to by pure bytecode which we don't trace,
               so we conservatively assume that it is live.  */
!           int pure_p = PURE_POINTER_P (sym->name);
            
            if (!XMARKBIT (sym->plist) && !pure_p)
              {
--- 5163,5169 ----
            /* Check if the symbol was created during loadup.  In such a case
               it might be pointed to by pure bytecode which we don't trace,
               so we conservatively assume that it is live.  */
!           int pure_p = PURE_POINTER_P (XSTRING (sym->xname));
            
            if (!XMARKBIT (sym->plist) && !pure_p)
              {
***************
*** 5178,5184 ****
              {
                ++num_used;
                if (!pure_p)
!                 UNMARK_STRING (sym->name);
                XUNMARK (sym->plist);
              }
          }
--- 5178,5184 ----
              {
                ++num_used;
                if (!pure_p)
!                 UNMARK_STRING (XSTRING (sym->xname));
                XUNMARK (sym->plist);
              }
          }