From 3fc43f428f3307ec2520122e562eecd5b85b507e Mon Sep 17 00:00:00 2001
From: Roland Conybeare <rconybeare@gmail.com>
Date: Fri, 3 Apr 2026 16:52:56 -0400
Subject: [PATCH] xo-gc: refactor: retire DX1Collector._forward_inplace_aux()

---
 xo-gc/include/xo/gc/DX1Collector.hpp | 2 +-
 xo-gc/src/gc/DX1Collector.cpp        | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/xo-gc/include/xo/gc/DX1Collector.hpp b/xo-gc/include/xo/gc/DX1Collector.hpp
index 555ef89a..ccc27536 100644
--- a/xo-gc/include/xo/gc/DX1Collector.hpp
+++ b/xo-gc/include/xo/gc/DX1Collector.hpp
@@ -388,12 +388,12 @@ namespace xo {
              **/
             void _forward_children_until_fixpoint(Generation upto,
                                                   const GCMoveCheckpoint & ckp);
-#endif
 
             /** Evacuate object at @p *lhs_data to to-space.
              *  Replace original with forwarding pointer to new location
              **/
             void _forward_inplace_aux(AGCObject * lhs_iface, void ** lhs_data, Generation upto);
+#endif
 
             /** Verify that pointer {@p iface, @p data} is valid:
              *  destination either in to-space, or somewhere outside this collector
diff --git a/xo-gc/src/gc/DX1Collector.cpp b/xo-gc/src/gc/DX1Collector.cpp
index e1fbe591..015492b7 100644
--- a/xo-gc/src/gc/DX1Collector.cpp
+++ b/xo-gc/src/gc/DX1Collector.cpp
@@ -859,7 +859,7 @@ namespace xo {
 
             if (runstate_.is_running()) {
                 // called during collection phase
-                this->_forward_inplace_aux(lhs_iface, lhs_data, upto);
+                gco_store_._forward_inplace_aux(this, lhs_iface, lhs_data, upto);
             } else if (runstate_.is_verify()) {
                 // called during verify_ok
                 this->_verify_aux(lhs_iface, *lhs_data);
@@ -869,6 +869,7 @@ namespace xo {
             }
         }
 
+#ifdef OBSOLETE
         void
         DX1Collector::_forward_inplace_aux(AGCObject * lhs_iface,
                                            void ** lhs_data,
@@ -878,6 +879,7 @@ namespace xo {
 
             gco_store_._forward_inplace_aux(this, lhs_iface, lhs_data, upto);
         } /*_forward_inplace_aux*/
+#endif
 
         void
         DX1Collector::_verify_aux(AGCObject * iface, void * data)