add more deref_const to fix cython build issues

ahilger · facebook-github-bot · commit f43db9409de4 · 2025-08-08T11:06:20.000-07:00
Summary: Python3.13t builds pull in a different version of Cython that's more picky / obstinate about refusing to cast rvalue returns to const lvalue ref. This fixes it for vector items in trunk builds.

Reviewed By: prakashgayasen

Differential Revision: D79842226

fbshipit-source-id: 8a44cf755a39ab51f1fbd54ce2d5f1ddcf0bde0c
diff --git a/third-party/thrift/src/thrift/compiler/generate/templates/py3/converter.pyx.mustache b/third-party/thrift/src/thrift/compiler/generate/templates/py3/converter.pyx.mustache
@@ -22,7 +22,10 @@ from libcpp.memory cimport make_shared, unique_ptr
 from cython.operator cimport dereference as deref, address
 from libcpp.utility cimport move as cmove
 {{^program:gen_py3_cython?}}
-from thrift.py3.types cimport const_pointer_cast
+from thrift.py3.types cimport (
+    const_pointer_cast,
+    deref_const as __deref_const,
+)
 cimport {{#program:py3Namespaces}}{{value}}.{{/program:py3Namespaces}}{{program:name}}.thrift_converter as {{!
     }}_{{#program:py3Namespaces}}{{value}}_{{/program:py3Namespaces}}{{program:name}}_thrift_converter
 {{#program:gen_legacy_container_converters?}}
diff --git a/third-party/thrift/src/thrift/compiler/generate/templates/py3/types/cython_python_to_cpp_item.mustache b/third-party/thrift/src/thrift/compiler/generate/templates/py3/types/cython_python_to_cpp_item.mustache
@@ -48,12 +48,13 @@ key, include the parallel CythonPythonToCppKey file instead.
   }}{{^program:auto_migrate?}}{{^program:inplace_migrate?}}{{!
     }}deref((<{{> types/cython_python_type}}>item).{{> types/cpp_obj}}){{!
   }}{{/program:inplace_migrate?}}{{#program:inplace_migrate?}}{{!
-  }}__deref_const[{{> types/cython_cpp_type}}]({{!
+    }}__deref_const[{{> types/cython_cpp_type}}]({{!
     }}{{type:capi_converter_path}}.{{struct:name}}_convert_to_cpp(item._to_python())){{!
   }}{{/program:inplace_migrate?}}{{/program:auto_migrate?}}{{!
   }}{{#program:auto_migrate?}}{{!
+    }}__deref_const[{{> types/cython_cpp_type}}]({{!
     }}{{#type:need_module_path?}}{{type:capi_converter_path}}.{{/type:need_module_path?}}{{!
-    }}{{struct:name}}_convert_to_cpp(item){{!
+    }}{{struct:name}}_convert_to_cpp(item)){{!
   }}{{/program:auto_migrate?}}{{!
 }}{{/type:structured}}{{!
 }}{{#type:container?}}{{!
diff --git a/third-party/thrift/src/thrift/compiler/generate/templates/py3/types/cython_python_to_cpp_key.mustache b/third-party/thrift/src/thrift/compiler/generate/templates/py3/types/cython_python_to_cpp_key.mustache
@@ -38,11 +38,13 @@ keys (conventionally used for sets, lists, and map values).
   }}{{^program:auto_migrate?}}{{^program:inplace_migrate?}}{{!
     }}deref((<{{> types/cython_python_type}}>key).{{> types/cpp_obj}}){{!
   }}{{/program:inplace_migrate?}}{{#program:inplace_migrate?}}{{!
-  }}{{type:capi_converter_path}}.{{struct:name}}_convert_to_cpp(key._to_python()){{!
+    }}__deref_const[{{> types/cython_cpp_type}}]({{!
+    }}{{type:capi_converter_path}}.{{struct:name}}_convert_to_cpp(key._to_python())){{!
   }}{{/program:inplace_migrate?}}{{/program:auto_migrate?}}{{!
   }}{{#program:auto_migrate?}}{{!
+    }}__deref_const[{{> types/cython_cpp_type}}]({{!
     }}{{#type:need_module_path?}}{{type:capi_converter_path}}.{{/type:need_module_path?}}{{!
-    }}{{struct:name}}_convert_to_cpp(key){{!
+    }}{{struct:name}}_convert_to_cpp(key)){{!
   }}{{/program:auto_migrate?}}{{!
 }}{{/type:structured}}{{!
 }}{{#type:container?}}{{!
diff --git a/third-party/thrift/src/thrift/compiler/test/fixtures/basic/out/py3_inplace/gen-py3/test/fixtures/basic/module/converter.pyx b/third-party/thrift/src/thrift/compiler/test/fixtures/basic/out/py3_inplace/gen-py3/test/fixtures/basic/module/converter.pyx
@@ -9,7 +9,10 @@
 from libcpp.memory cimport make_shared, unique_ptr
 from cython.operator cimport dereference as deref, address
 from libcpp.utility cimport move as cmove
-from thrift.py3.types cimport const_pointer_cast
+from thrift.py3.types cimport (
+    const_pointer_cast,
+    deref_const as __deref_const,
+)
 cimport test.fixtures.basic.module.thrift_converter as _test_fixtures_basic_module_thrift_converter
 import test.fixtures.basic.module.types as _test_fixtures_basic_module_types
 
diff --git a/third-party/thrift/src/thrift/compiler/test/fixtures/constants/out/py3_inplace/gen-py3/module/converter.pyx b/third-party/thrift/src/thrift/compiler/test/fixtures/constants/out/py3_inplace/gen-py3/module/converter.pyx
@@ -9,7 +9,10 @@
 from libcpp.memory cimport make_shared, unique_ptr
 from cython.operator cimport dereference as deref, address
 from libcpp.utility cimport move as cmove
-from thrift.py3.types cimport const_pointer_cast
+from thrift.py3.types cimport (
+    const_pointer_cast,
+    deref_const as __deref_const,
+)
 cimport module.thrift_converter as _module_thrift_converter
 import module.types as _module_types
 
diff --git a/third-party/thrift/src/thrift/compiler/test/fixtures/includes/out/py3_auto_migrate/gen-py3/includes/converter.pyx b/third-party/thrift/src/thrift/compiler/test/fixtures/includes/out/py3_auto_migrate/gen-py3/includes/converter.pyx
@@ -9,7 +9,10 @@
 from libcpp.memory cimport make_shared, unique_ptr
 from cython.operator cimport dereference as deref, address
 from libcpp.utility cimport move as cmove
-from thrift.py3.types cimport const_pointer_cast
+from thrift.py3.types cimport (
+    const_pointer_cast,
+    deref_const as __deref_const,
+)
 cimport includes.thrift_converter as _includes_thrift_converter
 
 
diff --git a/third-party/thrift/src/thrift/compiler/test/fixtures/includes/out/py3_auto_migrate/gen-py3/module/converter.pyx b/third-party/thrift/src/thrift/compiler/test/fixtures/includes/out/py3_auto_migrate/gen-py3/module/converter.pyx
@@ -9,7 +9,10 @@
 from libcpp.memory cimport make_shared, unique_ptr
 from cython.operator cimport dereference as deref, address
 from libcpp.utility cimport move as cmove
-from thrift.py3.types cimport const_pointer_cast
+from thrift.py3.types cimport (
+    const_pointer_cast,
+    deref_const as __deref_const,
+)
 cimport module.thrift_converter as _module_thrift_converter
 
 
diff --git a/third-party/thrift/src/thrift/compiler/test/fixtures/includes/out/py3_auto_migrate/gen-py3/transitive/converter.pyx b/third-party/thrift/src/thrift/compiler/test/fixtures/includes/out/py3_auto_migrate/gen-py3/transitive/converter.pyx
@@ -9,7 +9,10 @@
 from libcpp.memory cimport make_shared, unique_ptr
 from cython.operator cimport dereference as deref, address
 from libcpp.utility cimport move as cmove
-from thrift.py3.types cimport const_pointer_cast
+from thrift.py3.types cimport (
+    const_pointer_cast,
+    deref_const as __deref_const,
+)
 cimport transitive.thrift_converter as _transitive_thrift_converter
 
 
diff --git a/third-party/thrift/src/thrift/compiler/test/fixtures/includes/out/py3_auto_migrate_includes/gen-py3/includes/converter.pyx b/third-party/thrift/src/thrift/compiler/test/fixtures/includes/out/py3_auto_migrate_includes/gen-py3/includes/converter.pyx
@@ -9,7 +9,10 @@
 from libcpp.memory cimport make_shared, unique_ptr
 from cython.operator cimport dereference as deref, address
 from libcpp.utility cimport move as cmove
-from thrift.py3.types cimport const_pointer_cast
+from thrift.py3.types cimport (
+    const_pointer_cast,
+    deref_const as __deref_const,
+)
 cimport includes.thrift_converter as _includes_thrift_converter
 
 
diff --git a/third-party/thrift/src/thrift/compiler/test/fixtures/includes/out/py3_auto_migrate_includes/gen-py3/transitive/converter.pyx b/third-party/thrift/src/thrift/compiler/test/fixtures/includes/out/py3_auto_migrate_includes/gen-py3/transitive/converter.pyx
@@ -9,7 +9,10 @@
 from libcpp.memory cimport make_shared, unique_ptr
 from cython.operator cimport dereference as deref, address
 from libcpp.utility cimport move as cmove
-from thrift.py3.types cimport const_pointer_cast
+from thrift.py3.types cimport (
+    const_pointer_cast,
+    deref_const as __deref_const,
+)
 cimport transitive.thrift_converter as _transitive_thrift_converter
 
 
diff --git a/third-party/thrift/src/thrift/compiler/test/fixtures/includes/out/py3_auto_migrate_service/gen-py3/includes/converter.pyx b/third-party/thrift/src/thrift/compiler/test/fixtures/includes/out/py3_auto_migrate_service/gen-py3/includes/converter.pyx
@@ -9,7 +9,10 @@
 from libcpp.memory cimport make_shared, unique_ptr
 from cython.operator cimport dereference as deref, address
 from libcpp.utility cimport move as cmove
-from thrift.py3.types cimport const_pointer_cast
+from thrift.py3.types cimport (
+    const_pointer_cast,
+    deref_const as __deref_const,
+)
 cimport includes.thrift_converter as _includes_thrift_converter
 
 
diff --git a/third-party/thrift/src/thrift/compiler/test/fixtures/includes/out/py3_auto_migrate_service/gen-py3/module/converter.pyx b/third-party/thrift/src/thrift/compiler/test/fixtures/includes/out/py3_auto_migrate_service/gen-py3/module/converter.pyx
@@ -9,7 +9,10 @@
 from libcpp.memory cimport make_shared, unique_ptr
 from cython.operator cimport dereference as deref, address
 from libcpp.utility cimport move as cmove
-from thrift.py3.types cimport const_pointer_cast
+from thrift.py3.types cimport (
+    const_pointer_cast,
+    deref_const as __deref_const,
+)
 cimport module.thrift_converter as _module_thrift_converter
 
 
diff --git a/third-party/thrift/src/thrift/compiler/test/fixtures/includes/out/py3_auto_migrate_service/gen-py3/service/converter.pyx b/third-party/thrift/src/thrift/compiler/test/fixtures/includes/out/py3_auto_migrate_service/gen-py3/service/converter.pyx
@@ -9,7 +9,10 @@
 from libcpp.memory cimport make_shared, unique_ptr
 from cython.operator cimport dereference as deref, address
 from libcpp.utility cimport move as cmove
-from thrift.py3.types cimport const_pointer_cast
+from thrift.py3.types cimport (
+    const_pointer_cast,
+    deref_const as __deref_const,
+)
 cimport service.thrift_converter as _service_thrift_converter
 
 
diff --git a/third-party/thrift/src/thrift/compiler/test/fixtures/includes/out/py3_auto_migrate_service/gen-py3/transitive/converter.pyx b/third-party/thrift/src/thrift/compiler/test/fixtures/includes/out/py3_auto_migrate_service/gen-py3/transitive/converter.pyx
@@ -9,7 +9,10 @@
 from libcpp.memory cimport make_shared, unique_ptr
 from cython.operator cimport dereference as deref, address
 from libcpp.utility cimport move as cmove
-from thrift.py3.types cimport const_pointer_cast
+from thrift.py3.types cimport (
+    const_pointer_cast,
+    deref_const as __deref_const,
+)
 cimport transitive.thrift_converter as _transitive_thrift_converter
 
 
diff --git a/third-party/thrift/src/thrift/compiler/test/fixtures/includes/out/py3_auto_migrate_transitive/gen-py3/transitive/converter.pyx b/third-party/thrift/src/thrift/compiler/test/fixtures/includes/out/py3_auto_migrate_transitive/gen-py3/transitive/converter.pyx
@@ -9,7 +9,10 @@
 from libcpp.memory cimport make_shared, unique_ptr
 from cython.operator cimport dereference as deref, address
 from libcpp.utility cimport move as cmove
-from thrift.py3.types cimport const_pointer_cast
+from thrift.py3.types cimport (
+    const_pointer_cast,
+    deref_const as __deref_const,
+)
 cimport transitive.thrift_converter as _transitive_thrift_converter
 
 
diff --git a/third-party/thrift/src/thrift/compiler/test/fixtures/interactions/out/py3_inplace/gen-py3/test/fixtures/another_interactions/shared/converter.pyx b/third-party/thrift/src/thrift/compiler/test/fixtures/interactions/out/py3_inplace/gen-py3/test/fixtures/another_interactions/shared/converter.pyx
@@ -9,7 +9,10 @@
 from libcpp.memory cimport make_shared, unique_ptr
 from cython.operator cimport dereference as deref, address
 from libcpp.utility cimport move as cmove
-from thrift.py3.types cimport const_pointer_cast
+from thrift.py3.types cimport (
+    const_pointer_cast,
+    deref_const as __deref_const,
+)
 cimport test.fixtures.another_interactions.shared.thrift_converter as _test_fixtures_another_interactions_shared_thrift_converter
 import test.fixtures.another_interactions.shared.types as _test_fixtures_another_interactions_shared_types
 
diff --git a/third-party/thrift/src/thrift/compiler/test/fixtures/interactions/out/py3_inplace/gen-py3/test/fixtures/interactions/module/converter.pyx b/third-party/thrift/src/thrift/compiler/test/fixtures/interactions/out/py3_inplace/gen-py3/test/fixtures/interactions/module/converter.pyx
@@ -9,7 +9,10 @@
 from libcpp.memory cimport make_shared, unique_ptr
 from cython.operator cimport dereference as deref, address
 from libcpp.utility cimport move as cmove
-from thrift.py3.types cimport const_pointer_cast
+from thrift.py3.types cimport (
+    const_pointer_cast,
+    deref_const as __deref_const,
+)
 cimport test.fixtures.interactions.module.thrift_converter as _test_fixtures_interactions_module_thrift_converter
 import test.fixtures.interactions.module.types as _test_fixtures_interactions_module_types
 
diff --git a/third-party/thrift/src/thrift/compiler/test/fixtures/py3/out/py3_auto_migrate/gen-py3/module/converter.pyx b/third-party/thrift/src/thrift/compiler/test/fixtures/py3/out/py3_auto_migrate/gen-py3/module/converter.pyx
@@ -9,7 +9,10 @@
 from libcpp.memory cimport make_shared, unique_ptr
 from cython.operator cimport dereference as deref, address
 from libcpp.utility cimport move as cmove
-from thrift.py3.types cimport const_pointer_cast
+from thrift.py3.types cimport (
+    const_pointer_cast,
+    deref_const as __deref_const,
+)
 cimport module.thrift_converter as _module_thrift_converter
 
 
diff --git a/third-party/thrift/src/thrift/compiler/test/fixtures/py3/out/py3_auto_migrate_legacy_container_converters/gen-py3/module/converter.pyx b/third-party/thrift/src/thrift/compiler/test/fixtures/py3/out/py3_auto_migrate_legacy_container_converters/gen-py3/module/converter.pyx
@@ -9,7 +9,10 @@
 from libcpp.memory cimport make_shared, unique_ptr
 from cython.operator cimport dereference as deref, address
 from libcpp.utility cimport move as cmove
-from thrift.py3.types cimport const_pointer_cast
+from thrift.py3.types cimport (
+    const_pointer_cast,
+    deref_const as __deref_const,
+)
 cimport module.thrift_converter as _module_thrift_converter
 
 import module.types as _module_types
@@ -149,7 +152,7 @@ cdef vector[_module_cbindings.cSimpleStruct] List__SimpleStruct__make_instance(o
         for item in items:
             if not isinstance(item, _module_types.SimpleStruct):
                 raise TypeError(f"{item!r} is not of type _module_types.SimpleStruct")
-            c_inst.push_back(_module_thrift_converter.SimpleStruct_convert_to_cpp(item))
+            c_inst.push_back(__deref_const[_module_cbindings.cSimpleStruct](_module_thrift_converter.SimpleStruct_convert_to_cpp(item)))
         return cmove(c_inst)
 
 cdef cset[cint32_t] Set__i32__make_instance(object items) except *:
@@ -205,7 +208,7 @@ cdef cmap[string,_module_cbindings.cSimpleStruct] Map__string_SimpleStruct__make
             if not isinstance(item, _module_types.SimpleStruct):
                 raise TypeError(f"{item!r} is not of type _module_types.SimpleStruct")
     
-            c_inst[c_key] = _module_thrift_converter.SimpleStruct_convert_to_cpp(item)
+            c_inst[c_key] = __deref_const[_module_cbindings.cSimpleStruct](_module_thrift_converter.SimpleStruct_convert_to_cpp(item))
         return cmove(c_inst)
 
 cdef cmap[string,cint16_t] Map__string_i16__make_instance(object items) except *:
diff --git a/third-party/thrift/src/thrift/compiler/test/fixtures/py3/out/py3_inplace/gen-py3/module/converter.pyx b/third-party/thrift/src/thrift/compiler/test/fixtures/py3/out/py3_inplace/gen-py3/module/converter.pyx
@@ -9,7 +9,10 @@
 from libcpp.memory cimport make_shared, unique_ptr
 from cython.operator cimport dereference as deref, address
 from libcpp.utility cimport move as cmove
-from thrift.py3.types cimport const_pointer_cast
+from thrift.py3.types cimport (
+    const_pointer_cast,
+    deref_const as __deref_const,
+)
 cimport module.thrift_converter as _module_thrift_converter
 import module.types as _module_types
 
diff --git a/third-party/thrift/src/thrift/compiler/test/fixtures/py3/out/py3_inplace_auto_migrate/gen-py3/module/converter.pyx b/third-party/thrift/src/thrift/compiler/test/fixtures/py3/out/py3_inplace_auto_migrate/gen-py3/module/converter.pyx
@@ -9,7 +9,10 @@
 from libcpp.memory cimport make_shared, unique_ptr
 from cython.operator cimport dereference as deref, address
 from libcpp.utility cimport move as cmove
-from thrift.py3.types cimport const_pointer_cast
+from thrift.py3.types cimport (
+    const_pointer_cast,
+    deref_const as __deref_const,
+)
 cimport module.thrift_converter as _module_thrift_converter
 import module.types as _module_types
 
diff --git a/third-party/thrift/src/thrift/compiler/test/fixtures/stream/out/py3_inplace/gen-py3/module/converter.pyx b/third-party/thrift/src/thrift/compiler/test/fixtures/stream/out/py3_inplace/gen-py3/module/converter.pyx
@@ -9,7 +9,10 @@
 from libcpp.memory cimport make_shared, unique_ptr
 from cython.operator cimport dereference as deref, address
 from libcpp.utility cimport move as cmove
-from thrift.py3.types cimport const_pointer_cast
+from thrift.py3.types cimport (
+    const_pointer_cast,
+    deref_const as __deref_const,
+)
 cimport module.thrift_converter as _module_thrift_converter
 import module.types as _module_types
 
diff --git a/third-party/thrift/src/thrift/compiler/test/fixtures/types/out/py3_inplace/gen-py3/apache/thrift/fixtures/types/included/converter.pyx b/third-party/thrift/src/thrift/compiler/test/fixtures/types/out/py3_inplace/gen-py3/apache/thrift/fixtures/types/included/converter.pyx
@@ -9,7 +9,10 @@
 from libcpp.memory cimport make_shared, unique_ptr
 from cython.operator cimport dereference as deref, address
 from libcpp.utility cimport move as cmove
-from thrift.py3.types cimport const_pointer_cast
+from thrift.py3.types cimport (
+    const_pointer_cast,
+    deref_const as __deref_const,
+)
 cimport apache.thrift.fixtures.types.included.thrift_converter as _apache_thrift_fixtures_types_included_thrift_converter
 import apache.thrift.fixtures.types.included.types as _apache_thrift_fixtures_types_included_types
 
diff --git a/third-party/thrift/src/thrift/compiler/test/fixtures/types/out/py3_inplace/gen-py3/apache/thrift/fixtures/types/module/converter.pyx b/third-party/thrift/src/thrift/compiler/test/fixtures/types/out/py3_inplace/gen-py3/apache/thrift/fixtures/types/module/converter.pyx
@@ -9,7 +9,10 @@
 from libcpp.memory cimport make_shared, unique_ptr
 from cython.operator cimport dereference as deref, address
 from libcpp.utility cimport move as cmove
-from thrift.py3.types cimport const_pointer_cast
+from thrift.py3.types cimport (
+    const_pointer_cast,
+    deref_const as __deref_const,
+)
 cimport apache.thrift.fixtures.types.module.thrift_converter as _apache_thrift_fixtures_types_module_thrift_converter
 import apache.thrift.fixtures.types.module.types as _apache_thrift_fixtures_types_module_types
 
