From 1977b9f3f658dc34dd9c7cd4eab38c0a9be6cc9a Mon Sep 17 00:00:00 2001
From: Mangoostaa <uyholadea@gmail.com>
Date: Wed, 11 Mar 2026 10:55:56 +0000
Subject: [PATCH] Use std::forward in CustomBuildField for std::optional to
 allow move semantics, resolves FIXME

---
 include/mp/type-optional.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/include/mp/type-optional.h b/include/mp/type-optional.h
index 8bb74c4..80a8f4f 100644
--- a/include/mp/type-optional.h
+++ b/include/mp/type-optional.h
@@ -17,8 +17,7 @@ void CustomBuildField(TypeList<std::optional<LocalType>>,
 {
     if (value) {
         output.setHas();
-        // FIXME: should std::move value if destvalue is rref?
-        BuildField(TypeList<LocalType>(), invoke_context, output, *value);
+        BuildField(TypeList<LocalType>(), invoke_context, output, *std::forward<Value>(value));
     }
 }