Fix bug that we might patch incorrect field

Reviewed By: pranavtbhat Differential Revision: D68109683 fbshipit-source-id: 67f97ce24e6b4e23e5c72683a91accf7164db39d
facebook · Jan 13, 2025 · 7475293 · 7475293
1 parent e80a85e
commit 7475293
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/third-party/thrift/src/thrift/lib/cpp2/op/detail/StructPatch.h b/third-party/thrift/src/thrift/lib/cpp2/op/detail/StructPatch.h
@@ -371,9 +371,10 @@ class BaseEnsurePatch : public BaseClearPatch<Patch, Derived> {
   /// object.
   template <class Id>
   decltype(auto) patch() {
-    using Ret = op::get_native_type<typename patch_type::underlying_type, Id>;
+    using FieldPatchType = typename patch_type::underlying_type;
+    using Ret = op::get_native_type<FieldPatchType, Id>;
     return *reinterpret_cast<Ret*>(
-        typeErasedPatchImpl<op::get_ordinal_v<T, Id>>(
+        typeErasedPatchImpl<op::get_ordinal_v<FieldPatchType, Id>>(
             static_cast<Derived&>(*this)));
   }