From 59573ac1f9b1a6d91f35bd5a7499f1ad8cf9a83a Mon Sep 17 00:00:00 2001
From: Benoit Blanchon <git@benoitblanchon.fr>
Date: Mon, 14 Jul 2025 19:13:31 +0200
Subject: [PATCH] ResourceManager: decouple from `VariantImpl`

---
 src/ArduinoJson/Memory/ResourceManagerImpl.hpp | 2 --
 src/ArduinoJson/Variant/VariantImpl.hpp        | 1 +
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/ArduinoJson/Memory/ResourceManagerImpl.hpp b/src/ArduinoJson/Memory/ResourceManagerImpl.hpp
index 2d9b6dad..2c7776d8 100644
--- a/src/ArduinoJson/Memory/ResourceManagerImpl.hpp
+++ b/src/ArduinoJson/Memory/ResourceManagerImpl.hpp
@@ -6,7 +6,6 @@
 
 #include <ArduinoJson/Memory/ResourceManager.hpp>
 #include <ArduinoJson/Polyfills/alias_cast.hpp>
-#include <ArduinoJson/Variant/VariantImpl.hpp>
 
 ARDUINOJSON_BEGIN_PRIVATE_NAMESPACE
 
@@ -21,7 +20,6 @@ inline Slot<VariantData> ResourceManager::allocVariant() {
 }
 
 inline void ResourceManager::freeVariant(Slot<VariantData> slot) {
-  VariantImpl(slot.ptr(), this).clear();
   variantPools_.freeSlot(slot);
 }
 
diff --git a/src/ArduinoJson/Variant/VariantImpl.hpp b/src/ArduinoJson/Variant/VariantImpl.hpp
index 66e2e3fe..2b601539 100644
--- a/src/ArduinoJson/Variant/VariantImpl.hpp
+++ b/src/ArduinoJson/Variant/VariantImpl.hpp
@@ -548,6 +548,7 @@ class VariantImpl {
 
   void freeVariant(Slot<VariantData> slot) {
     ARDUINOJSON_ASSERT(resources_ != nullptr);
+    VariantImpl(slot.ptr(), resources_).clear();
     resources_->freeVariant(slot);
   }