comparison src/fns.c @ 30634:d833a6450e10

(sweep_weak_hash_tables): Fix the code taking unmarked tables out of the list of all weak hash tables.

30633:3ea6ae5c3939

   from Vweak_hash_tables.  Called from gc_sweep.  */

void
sweep_weak_hash_tables ()
{
  Lisp_Object table;
  struct Lisp_Hash_Table *h, *prev;
  int marked;

  /* Mark all keys and values that are in use.  Keep on marking until
     there is no more change.  This is necessary for cases like
     value-weak table A containing an entry X -> Y, where Y is used in a

	}
    }
  while (marked);

  /* Remove tables and entries that aren't used.  */
  prev = NULL;
  for (table = Vweak_hash_tables; !GC_NILP (table); table = h->next_weak)
    {
      prev = h;
      h = XHASH_TABLE (table);

      if (h->size & ARRAY_MARK_FLAG)
	{
	  if (XFASTINT (h->count) > 0)
	    sweep_weak_table (h, 1);
	}
      else
	{
	  /* Table is not marked, and will thus be freed.
	     Take it out of the list of weak hash tables.  */
	  if (prev)
	    prev->next_weak = h->next_weak;
	  else
	    Vweak_hash_tables = h->next_weak;
	}
    }
}



/***********************************************************************

30634:d833a6450e10

   from Vweak_hash_tables.  Called from gc_sweep.  */

void
sweep_weak_hash_tables ()
{
  Lisp_Object table, used, next;
  struct Lisp_Hash_Table *h;
  int marked;

  /* Mark all keys and values that are in use.  Keep on marking until
     there is no more change.  This is necessary for cases like
     value-weak table A containing an entry X -> Y, where Y is used in a

	}
    }
  while (marked);

  /* Remove tables and entries that aren't used.  */
  for (table = Vweak_hash_tables, used = Qnil; !GC_NILP (table); table = next)
    {
      h = XHASH_TABLE (table);
      next = h->next_weak;
      
      if (h->size & ARRAY_MARK_FLAG)
	{
	  /* TABLE is marked as used.  Sweep its contents.  */
	  if (XFASTINT (h->count) > 0)
	    sweep_weak_table (h, 1);

	  /* Add table to the list of used weak hash tables.  */
	  h->next_weak = used;
	  used = table;
	}
    }

  Vweak_hash_tables = used;
}



/***********************************************************************