Re: scratch/no-purespace 976196cba66 07/13: Pure storage removal: Replace calls to removed functions

Re: scratch/no-purespace 976196cba66 07/13: Pure storage removal: Replace calls to removed functions

[Stefan Kangas]

Pip Cet via Mailing list for Emacs changes <emacs-diffs@gnu.org> writes:

> branch: scratch/no-purespace
> commit 976196cba66992bcc0aa581403f2d215136547d6
> Author: Pip Cet <pipcet@protonmail.com>
> Commit: Pip Cet <pipcet@protonmail.com>
>
>     Pure storage removal: Replace calls to removed functions

With clang, I get this warning now:

alloc.c:6706:13: warning: variable 'po' set but not used
[-Wunused-but-set-variable]
      void *po = XPNTR (obj);

The below seems to fix it, but maybe there's a cleaner fix:

diff --git a/src/alloc.c b/src/alloc.c
index 974fb14115f..ae40a7f6686 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -6703,7 +6703,9 @@ process_mark_stack (ptrdiff_t base_sp)
     {
       Lisp_Object obj = mark_stack_pop ();
     mark_obj: ;
+#if GC_CHECK_MARKED_OBJECTS
       void *po = XPNTR (obj);
+#endif

 #if GC_REMEMBER_LAST_MARKED
       last_marked[last_marked_index++] = obj;
@@ -6950,7 +6952,11 @@ #define CHECK_ALLOCATED_AND_LIVE_SYMBOL()		((void) 0)
 	    set_string_marked (XSTRING (ptr->u.s.name));
 	    mark_interval_tree (string_intervals (ptr->u.s.name));
 	    /* Inner loop to mark next symbol in this bucket, if any.  */
+#if GC_CHECK_MARKED_OBJECTS
 	    po = ptr = ptr->u.s.next;
+#else
+	    ptr = ptr->u.s.next;
+#endif
 	    if (ptr)
 	      goto nextsym;
 	  }

Re: scratch/no-purespace 976196cba66 07/13: Pure storage removal: Replace calls to removed functions

[Pip Cet]

"Stefan Kangas" <stefankangas@gmail.com> writes:

> Pip Cet via Mailing list for Emacs changes <emacs-diffs@gnu.org> writes:
>
>> branch: scratch/no-purespace
>> commit 976196cba66992bcc0aa581403f2d215136547d6
>> Author: Pip Cet <pipcet@protonmail.com>
>> Commit: Pip Cet <pipcet@protonmail.com>
>>
>>     Pure storage removal: Replace calls to removed functions
>
> With clang, I get this warning now:
>
> alloc.c:6706:13: warning: variable 'po' set but not used
> [-Wunused-but-set-variable]
>       void *po = XPNTR (obj);

Thank you! Hopefully fixed now.

Pip