From 573d29e020a4f120a78b7114a988108fc90a5be8 Mon Sep 17 00:00:00 2001
From: Douglas Katzman <dougk@google.com>
Date: Sat, 17 Dec 2016 14:05:40 -0500
Subject: [PATCH] Define scav_vector_nil more concisely

---
 src/runtime/gc-common.c | 21 +--------------------
 1 file changed, 1 insertion(+), 20 deletions(-)

diff --git a/src/runtime/gc-common.c b/src/runtime/gc-common.c
index 70971ca99..c1a65b417 100644
--- a/src/runtime/gc-common.c
+++ b/src/runtime/gc-common.c
@@ -940,26 +940,6 @@ size_vector(lispobj *where)
     return CEILING(length + 2, 2);
 }
 
-static sword_t
-scav_vector_nil(lispobj *where, lispobj object)
-{
-    return 2;
-}
-
-static lispobj
-trans_vector_nil(lispobj object)
-{
-    gc_assert(is_lisp_pointer(object));
-    return copy_unboxed_object(object, 2);
-}
-
-static sword_t
-size_vector_nil(lispobj *where)
-{
-    /* Just the header word and the length word */
-    return 2;
-}
-
 #define DEF_SCAV_TRANS_SIZE_UB(nbits) \
   DEF_SPECIALIZED_VECTOR(unsigned_byte_##nbits, NWORDS(length, nbits))
 #define DEF_SPECIALIZED_VECTOR(name, nwords) \
@@ -977,6 +957,7 @@ size_vector_nil(lispobj *where)
     return CEILING(nwords + 2, 2); \
   }
 
+DEF_SPECIALIZED_VECTOR(nil, 0)
 DEF_SPECIALIZED_VECTOR(bit, NWORDS(length,1))
 DEF_SCAV_TRANS_SIZE_UB(2)
 DEF_SCAV_TRANS_SIZE_UB(4)
-- 
2.11.4.GIT