Rename unboxed_obj_widetag_p() to leaf_obj_widetag_p()

src/code/debug-info.lisp

@@ -70,7 +70,7 @@
 
 ;;; Means the previous live-set is the same. Since -live is implied,
 ;;; the -live bit is repurposed to mean that the form-number is also
-;;; the same.   
+;;; the same.
 (defconstant compiled-code-location-equal-live       (ash #b10000 3))
 
 (defconstant debug-info-var-deleted -1)

src/compiler/generic/late-objdef.lisp

@@ -142,7 +142,7 @@
     (dolist (entry *scav/trans/size*)
       (when (string= (second entry) "unboxed")
         (setf bits (logior bits (ash 1 (ash (car entry) -2))))))
-    (format stream "static inline boolean unboxed_obj_widetag_p(unsigned char widetag) {~%")
+    (format stream "static inline boolean leaf_obj_widetag_p(unsigned char widetag) {~%")
     #+64-bit (format stream "  return (0x~XLU >> (widetag>>2)) & 1;" bits)
     #-64-bit (format stream "  int bit = widetag>>2;
   return (bit<32 ? 0x~XU >> bit : 0x~XU >> (bit-32)) & 1;"

src/runtime/coalesce.c

@@ -184,7 +184,7 @@ static uword_t coalesce_range(lispobj* where, lispobj* limit, uword_t arg)
                 nwords = code_header_words((struct code*)where);
                 break;
             default:
-                if (unboxed_obj_widetag_p(widetag))
+                if (leaf_obj_widetag_p(widetag))
                     continue; // Ignore this object.
             }
             for(i=1; i<nwords; ++i)

src/runtime/fullcgc.c

@@ -204,7 +204,7 @@ void __mark_obj(lispobj pointer)
                 return; // already marked
             *base |= MARK_BIT;
         }
-        if (unboxed_obj_widetag_p(header_widetag(header)))
+        if (leaf_obj_widetag_p(header_widetag(header)))
             return;
     } else {
         uword_t key = compute_page_key(pointer);
@@ -341,7 +341,7 @@ static void trace_object(lispobj* where)
             add_to_weak_pointer_chain(weakptr);
         return;
     default:
-        if (unboxed_obj_widetag_p(widetag)) return;
+        if (leaf_obj_widetag_p(widetag)) return;
     }
     for(i=scan_from; i<scan_to; ++i)
         gc_mark_obj(where[i]);

src/runtime/gencgc.c

@@ -2725,7 +2725,7 @@ verify_range(lispobj *where, sword_t nwords, struct verify_state *state)
         } else if (!(other_immediate_lowtag_p(widetag)
                      && lowtag_for_widetag[widetag>>2])) {
             lose("Unhandled widetag %d at %p", widetag, where);
-        } else if (unboxed_obj_widetag_p(widetag)) {
+        } else if (leaf_obj_widetag_p(widetag)) {
             count = sizetab[widetag](where);
             if (strict_containment && gencgc_verbose
                 && widetag == SAP_WIDETAG && where[1])

src/runtime/immobile-space.c

@@ -442,7 +442,7 @@ enliven_immobile_obj(lispobj *ptr, int rescan) // a native pointer
     if (widetag_of(ptr) == SIMPLE_FUN_WIDETAG)
         ptr = fun_code_header(ptr);
     gc_assert(__immobile_obj_gen_bits(ptr) == from_space);
-    int pointerish = !unboxed_obj_widetag_p(widetag_of(ptr));
+    int pointerish = !leaf_obj_widetag_p(widetag_of(ptr));
     int bits = (pointerish ? 0 : IMMOBILE_OBJ_VISITED_FLAG);
     // enlivening makes the object appear as if written, so that
     // scav_code_header won't skip it, thus ensuring we transitively
@@ -860,7 +860,7 @@ varyobj_points_to_younger_p(lispobj* obj, int gen, int keep_gen, int new_gen,
         sword_t length = fixnum_value(((struct vector *)obj)->length);
         begin = obj + 2; // skip the header and length
         end = obj + ALIGN_UP(length + 2, 2);
-    } else if (unboxed_obj_widetag_p(widetag)) {
+    } else if (leaf_obj_widetag_p(widetag)) {
         return 0;
     } else {
         lose("Unexpected widetag %x @ %p", widetag, obj);
@@ -1669,7 +1669,7 @@ static void fixup_space(lispobj* where, size_t n_words)
         size = sizetab[widetag](where);
         switch (widetag) {
         default:
-          if (!unboxed_obj_widetag_p(widetag))
+          if (!leaf_obj_widetag_p(widetag))
             lose("Unhandled widetag in fixup_space: %p\n", (void*)header_word);
           break;
 #ifdef LISP_FEATURE_COMPACT_INSTANCE_HEADER

src/runtime/traceroot.c

@@ -770,7 +770,7 @@ static uword_t build_refs(lispobj* where, lispobj* end,
             if (!(other_immediate_lowtag_p(widetag) && lowtag_for_widetag[widetag>>2]))
               lose("Unknown widetag %x\n", widetag);
             // Skip irrelevant objects.
-            if (unboxed_obj_widetag_p(widetag) ||
+            if (leaf_obj_widetag_p(widetag) ||
                 (widetag == WEAK_POINTER_WIDETAG) || /* do not follow! */
                 // These numeric types contain pointers, but are uninteresting.
                 (widetag == COMPLEX_WIDETAG) ||

src/runtime/x86-64-arch.c

@@ -1,4 +1,4 @@
- /*
+/*
  * This software is part of the SBCL system. See the README file for
  * more information.
  *