From 91ba12f444dc94af53cb697d2279b5c89eaac0c9 Mon Sep 17 00:00:00 2001
From: Andy Wingo <wingo@pobox.com>
Date: Tue, 24 Jun 2025 15:12:33 +0200
Subject: [PATCH] Fix vtable base layout

* libguile/struct.h (SCM_VTABLE_BASE_LAYOUT): Update for unboxed-fields
representation change.
* module/oop/goops.scm (fold-class-slots): Likewise.
---
 libguile/struct.h    | 2 +-
 module/oop/goops.scm | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libguile/struct.h b/libguile/struct.h
index b0383603e..26697352c 100644
--- a/libguile/struct.h
+++ b/libguile/struct.h
@@ -61,7 +61,7 @@
   "pw" /* printer */                                                    \
   "ph" /* name (hidden from make-struct for back-compat reasons) */     \
   "uh" /* size */							\
-  "uh" /* unboxed fields */						\
+  "ph" /* unboxed fields */						\
   "uh" /* reserved */
 
 #define scm_vtable_index_layout            0 /* A symbol describing the physical arrangement of this type. */
diff --git a/module/oop/goops.scm b/module/oop/goops.scm
index ccc68db6b..24f1d9aa1 100644
--- a/module/oop/goops.scm
+++ b/module/oop/goops.scm
@@ -192,7 +192,7 @@
   (print)
   (name #:class <protected-hidden-slot>)
   (nfields #:class <hidden-slot>)
-  (%reserved-6 #:class <hidden-slot>)
+  (unboxed-fields #:class <protected-hidden-slot>)
   (%reserved-7 #:class <hidden-slot>)
   (direct-supers)
   (direct-slots)