De-templatize non-ref field accessors in C++ code generation

Summary:
Field accessor methods were previously emitted during code generation as templates to reduce the amount of code being compiled and improve build performance, by only compiling overloads which were used by user code.

Benchmarking shows that the build-time performance benefit of this is now negligible, so we can now emit these accessors as non-templated methods.

#buildall #buildsonlynotests

Reviewed By: vitaut

Differential Revision: D77674004

fbshipit-source-id: 5a03d300018a273cb39a63cc67502b1436a7e3fc

Author: hchokshi

third-party/thrift/src/thrift/compiler/generate/templates/cpp2/module_types_h/field_ref.mustache

@@ -72,63 +72,55 @@
  private:
 {{/struct:legacy_api?}}
   {{> common/field_docblock}}
-  template <typename..., typename fbthrift_T = {{field:cpp_storage_type}}>
-  {{field:cpp_accessor_attribute}} fbthrift_T& {{field:cpp_name}}_ref() & {
+  {{field:cpp_accessor_attribute}} {{field:cpp_storage_type}}& {{field:cpp_name}}_ref() & {
 {{> module_types_h/field_interceptor}}
     return {{> common/field_value}};
   }
 
   {{> common/field_docblock}}
-  template <typename..., typename fbthrift_T = {{field:cpp_storage_type}}>
-  {{field:cpp_accessor_attribute}} const fbthrift_T& {{field:cpp_name}}_ref() const& {
+  {{field:cpp_accessor_attribute}} const {{field:cpp_storage_type}}& {{field:cpp_name}}_ref() const& {
 {{> module_types_h/field_interceptor}}
     return {{> common/field_value}};
   }
 
   {{> common/field_docblock}}
-  template <typename..., typename fbthrift_T = {{field:cpp_storage_type}}>
-  {{field:cpp_accessor_attribute}} fbthrift_T&& {{field:cpp_name}}_ref() && {
+  {{field:cpp_accessor_attribute}} {{field:cpp_storage_type}}&& {{field:cpp_name}}_ref() && {
 {{> module_types_h/field_interceptor}}
-    return static_cast<fbthrift_T&&>({{> common/field_value}});
+    return static_cast<{{field:cpp_storage_type}}&&>({{> common/field_value}});
   }
 
   {{> common/field_docblock}}
-  template <typename..., typename fbthrift_T = {{field:cpp_storage_type}}>
-  {{field:cpp_accessor_attribute}} const fbthrift_T&& {{field:cpp_name}}_ref() const&& {
+  {{field:cpp_accessor_attribute}} const {{field:cpp_storage_type}}&& {{field:cpp_name}}_ref() const&& {
 {{> module_types_h/field_interceptor}}
-    return static_cast<const fbthrift_T&&>({{> common/field_value}});
+    return static_cast<const {{field:cpp_storage_type}}&&>({{> common/field_value}});
   }
 {{^struct:legacy_api?}}
  public:
 {{/struct:legacy_api?}}
 {{#field:eligible_for_storage_name_mangling?}}
 
   {{> common/field_docblock}}
-  template <typename..., typename fbthrift_T = {{field:cpp_storage_type}}>
-  FOLLY_ERASE fbthrift_T& {{field:cpp_name}}() & {
+  FOLLY_ERASE {{field:cpp_storage_type}}& {{field:cpp_name}}() & {
 {{> module_types_h/field_interceptor}}
     return {{> common/field_value}};
   }
 
   {{> common/field_docblock}}
-  template <typename..., typename fbthrift_T = {{field:cpp_storage_type}}>
-  FOLLY_ERASE const fbthrift_T& {{field:cpp_name}}() const& {
+  FOLLY_ERASE const {{field:cpp_storage_type}}& {{field:cpp_name}}() const& {
 {{> module_types_h/field_interceptor}}
     return {{> common/field_value}};
   }
 
   {{> common/field_docblock}}
-  template <typename..., typename fbthrift_T = {{field:cpp_storage_type}}>
-  FOLLY_ERASE fbthrift_T&& {{field:cpp_name}}() && {
+  FOLLY_ERASE {{field:cpp_storage_type}}&& {{field:cpp_name}}() && {
 {{> module_types_h/field_interceptor}}
-    return static_cast<fbthrift_T&&>({{> common/field_value}});
+    return static_cast<{{field:cpp_storage_type}}&&>({{> common/field_value}});
   }
 
   {{> common/field_docblock}}
-  template <typename..., typename fbthrift_T = {{field:cpp_storage_type}}>
-  FOLLY_ERASE const fbthrift_T&& {{field:cpp_name}}() const&& {
+  FOLLY_ERASE const {{field:cpp_storage_type}}&& {{field:cpp_name}}() const&& {
 {{> module_types_h/field_interceptor}}
-    return static_cast<const fbthrift_T&&>({{> common/field_value}});
+    return static_cast<const {{field:cpp_storage_type}}&&>({{> common/field_value}});
   }
 {{/field:eligible_for_storage_name_mangling?}}
 {{/field:use_field_ref?}}

third-party/thrift/src/thrift/compiler/test/fixtures/adapter/out/cpp2/gen-cpp2/module_types.h

@@ -859,51 +859,43 @@ class structured_annotation_recursive final  {
     return {static_cast<fbthrift_T&&>(this->__fbthrift_field_name), __isset.at(0), __isset.bit(0)};
   }
   /** Glean { "field": "recurse" } */
-  template <typename..., typename fbthrift_T = ::std::unique_ptr<::test::fixtures::basic-structured-annotations::structured_annotation_recursive>>
-  FOLLY_ERASE fbthrift_T& recurse_ref() & {
+  FOLLY_ERASE ::std::unique_ptr<::test::fixtures::basic-structured-annotations::structured_annotation_recursive>& recurse_ref() & {
     return __fbthrift_field_recurse;
   }
 
   /** Glean { "field": "recurse" } */
-  template <typename..., typename fbthrift_T = ::std::unique_ptr<::test::fixtures::basic-structured-annotations::structured_annotation_recursive>>
-  FOLLY_ERASE const fbthrift_T& recurse_ref() const& {
+  FOLLY_ERASE const ::std::unique_ptr<::test::fixtures::basic-structured-annotations::structured_annotation_recursive>& recurse_ref() const& {
     return __fbthrift_field_recurse;
   }
 
   /** Glean { "field": "recurse" } */
-  template <typename..., typename fbthrift_T = ::std::unique_ptr<::test::fixtures::basic-structured-annotations::structured_annotation_recursive>>
-  FOLLY_ERASE fbthrift_T&& recurse_ref() && {
-    return static_cast<fbthrift_T&&>(__fbthrift_field_recurse);
+  FOLLY_ERASE ::std::unique_ptr<::test::fixtures::basic-structured-annotations::structured_annotation_recursive>&& recurse_ref() && {
+    return static_cast<::std::unique_ptr<::test::fixtures::basic-structured-annotations::structured_annotation_recursive>&&>(__fbthrift_field_recurse);
   }
 
   /** Glean { "field": "recurse" } */
-  template <typename..., typename fbthrift_T = ::std::unique_ptr<::test::fixtures::basic-structured-annotations::structured_annotation_recursive>>
-  FOLLY_ERASE const fbthrift_T&& recurse_ref() const&& {
-    return static_cast<const fbthrift_T&&>(__fbthrift_field_recurse);
+  FOLLY_ERASE const ::std::unique_ptr<::test::fixtures::basic-structured-annotations::structured_annotation_recursive>&& recurse_ref() const&& {
+    return static_cast<const ::std::unique_ptr<::test::fixtures::basic-structured-annotations::structured_annotation_recursive>&&>(__fbthrift_field_recurse);
   }
 
   /** Glean { "field": "recurse" } */
-  template <typename..., typename fbthrift_T = ::std::unique_ptr<::test::fixtures::basic-structured-annotations::structured_annotation_recursive>>
-  FOLLY_ERASE fbthrift_T& recurse() & {
+  FOLLY_ERASE ::std::unique_ptr<::test::fixtures::basic-structured-annotations::structured_annotation_recursive>& recurse() & {
     return __fbthrift_field_recurse;
   }
 
   /** Glean { "field": "recurse" } */
-  template <typename..., typename fbthrift_T = ::std::unique_ptr<::test::fixtures::basic-structured-annotations::structured_annotation_recursive>>
-  FOLLY_ERASE const fbthrift_T& recurse() const& {
+  FOLLY_ERASE const ::std::unique_ptr<::test::fixtures::basic-structured-annotations::structured_annotation_recursive>& recurse() const& {
     return __fbthrift_field_recurse;
   }
 
   /** Glean { "field": "recurse" } */
-  template <typename..., typename fbthrift_T = ::std::unique_ptr<::test::fixtures::basic-structured-annotations::structured_annotation_recursive>>
-  FOLLY_ERASE fbthrift_T&& recurse() && {
-    return static_cast<fbthrift_T&&>(__fbthrift_field_recurse);
+  FOLLY_ERASE ::std::unique_ptr<::test::fixtures::basic-structured-annotations::structured_annotation_recursive>&& recurse() && {
+    return static_cast<::std::unique_ptr<::test::fixtures::basic-structured-annotations::structured_annotation_recursive>&&>(__fbthrift_field_recurse);
   }
 
   /** Glean { "field": "recurse" } */
-  template <typename..., typename fbthrift_T = ::std::unique_ptr<::test::fixtures::basic-structured-annotations::structured_annotation_recursive>>
-  FOLLY_ERASE const fbthrift_T&& recurse() const&& {
-    return static_cast<const fbthrift_T&&>(__fbthrift_field_recurse);
+  FOLLY_ERASE const ::std::unique_ptr<::test::fixtures::basic-structured-annotations::structured_annotation_recursive>&& recurse() const&& {
+    return static_cast<const ::std::unique_ptr<::test::fixtures::basic-structured-annotations::structured_annotation_recursive>&&>(__fbthrift_field_recurse);
   }
 
   /** Glean { "field": "forward" } */

third-party/thrift/src/thrift/compiler/test/fixtures/basic-structured-annotations/out/cpp2/gen-cpp2/module_types.h

@@ -119,98 +119,82 @@ class Foo final  {
   bool operator==(const Foo&) const;
   bool operator<(const Foo&) const;
   /** Glean { "field": "foo" } */
-  template <typename..., typename fbthrift_T = ::std::unique_ptr<::cpp2::Foo>>
-  FOLLY_ERASE fbthrift_T& foo_ref() & {
+  FOLLY_ERASE ::std::unique_ptr<::cpp2::Foo>& foo_ref() & {
     return __fbthrift_field_foo;
   }
 
   /** Glean { "field": "foo" } */
-  template <typename..., typename fbthrift_T = ::std::unique_ptr<::cpp2::Foo>>
-  FOLLY_ERASE const fbthrift_T& foo_ref() const& {
+  FOLLY_ERASE const ::std::unique_ptr<::cpp2::Foo>& foo_ref() const& {
     return __fbthrift_field_foo;
   }
 
   /** Glean { "field": "foo" } */
-  template <typename..., typename fbthrift_T = ::std::unique_ptr<::cpp2::Foo>>
-  FOLLY_ERASE fbthrift_T&& foo_ref() && {
-    return static_cast<fbthrift_T&&>(__fbthrift_field_foo);
+  FOLLY_ERASE ::std::unique_ptr<::cpp2::Foo>&& foo_ref() && {
+    return static_cast<::std::unique_ptr<::cpp2::Foo>&&>(__fbthrift_field_foo);
   }
 
   /** Glean { "field": "foo" } */
-  template <typename..., typename fbthrift_T = ::std::unique_ptr<::cpp2::Foo>>
-  FOLLY_ERASE const fbthrift_T&& foo_ref() const&& {
-    return static_cast<const fbthrift_T&&>(__fbthrift_field_foo);
+  FOLLY_ERASE const ::std::unique_ptr<::cpp2::Foo>&& foo_ref() const&& {
+    return static_cast<const ::std::unique_ptr<::cpp2::Foo>&&>(__fbthrift_field_foo);
   }
 
   /** Glean { "field": "foo" } */
-  template <typename..., typename fbthrift_T = ::std::unique_ptr<::cpp2::Foo>>
-  FOLLY_ERASE fbthrift_T& foo() & {
+  FOLLY_ERASE ::std::unique_ptr<::cpp2::Foo>& foo() & {
     return __fbthrift_field_foo;
   }
 
   /** Glean { "field": "foo" } */
-  template <typename..., typename fbthrift_T = ::std::unique_ptr<::cpp2::Foo>>
-  FOLLY_ERASE const fbthrift_T& foo() const& {
+  FOLLY_ERASE const ::std::unique_ptr<::cpp2::Foo>& foo() const& {
     return __fbthrift_field_foo;
   }
 
   /** Glean { "field": "foo" } */
-  template <typename..., typename fbthrift_T = ::std::unique_ptr<::cpp2::Foo>>
-  FOLLY_ERASE fbthrift_T&& foo() && {
-    return static_cast<fbthrift_T&&>(__fbthrift_field_foo);
+  FOLLY_ERASE ::std::unique_ptr<::cpp2::Foo>&& foo() && {
+    return static_cast<::std::unique_ptr<::cpp2::Foo>&&>(__fbthrift_field_foo);
   }
 
   /** Glean { "field": "foo" } */
-  template <typename..., typename fbthrift_T = ::std::unique_ptr<::cpp2::Foo>>
-  FOLLY_ERASE const fbthrift_T&& foo() const&& {
-    return static_cast<const fbthrift_T&&>(__fbthrift_field_foo);
+  FOLLY_ERASE const ::std::unique_ptr<::cpp2::Foo>&& foo() const&& {
+    return static_cast<const ::std::unique_ptr<::cpp2::Foo>&&>(__fbthrift_field_foo);
   }
   /** Glean { "field": "bar" } */
-  template <typename..., typename fbthrift_T = ::std::shared_ptr<::cpp2::Foo>>
-  FOLLY_ERASE fbthrift_T& bar_ref() & {
+  FOLLY_ERASE ::std::shared_ptr<::cpp2::Foo>& bar_ref() & {
     return __fbthrift_field_bar;
   }
 
   /** Glean { "field": "bar" } */
-  template <typename..., typename fbthrift_T = ::std::shared_ptr<::cpp2::Foo>>
-  FOLLY_ERASE const fbthrift_T& bar_ref() const& {
+  FOLLY_ERASE const ::std::shared_ptr<::cpp2::Foo>& bar_ref() const& {
     return __fbthrift_field_bar;
   }
 
   /** Glean { "field": "bar" } */
-  template <typename..., typename fbthrift_T = ::std::shared_ptr<::cpp2::Foo>>
-  FOLLY_ERASE fbthrift_T&& bar_ref() && {
-    return static_cast<fbthrift_T&&>(__fbthrift_field_bar);
+  FOLLY_ERASE ::std::shared_ptr<::cpp2::Foo>&& bar_ref() && {
+    return static_cast<::std::shared_ptr<::cpp2::Foo>&&>(__fbthrift_field_bar);
   }
 
   /** Glean { "field": "bar" } */
-  template <typename..., typename fbthrift_T = ::std::shared_ptr<::cpp2::Foo>>
-  FOLLY_ERASE const fbthrift_T&& bar_ref() const&& {
-    return static_cast<const fbthrift_T&&>(__fbthrift_field_bar);
+  FOLLY_ERASE const ::std::shared_ptr<::cpp2::Foo>&& bar_ref() const&& {
+    return static_cast<const ::std::shared_ptr<::cpp2::Foo>&&>(__fbthrift_field_bar);
   }
 
   /** Glean { "field": "bar" } */
-  template <typename..., typename fbthrift_T = ::std::shared_ptr<::cpp2::Foo>>
-  FOLLY_ERASE fbthrift_T& bar() & {
+  FOLLY_ERASE ::std::shared_ptr<::cpp2::Foo>& bar() & {
     return __fbthrift_field_bar;
   }
 
   /** Glean { "field": "bar" } */
-  template <typename..., typename fbthrift_T = ::std::shared_ptr<::cpp2::Foo>>
-  FOLLY_ERASE const fbthrift_T& bar() const& {
+  FOLLY_ERASE const ::std::shared_ptr<::cpp2::Foo>& bar() const& {
     return __fbthrift_field_bar;
   }
 
   /** Glean { "field": "bar" } */
-  template <typename..., typename fbthrift_T = ::std::shared_ptr<::cpp2::Foo>>
-  FOLLY_ERASE fbthrift_T&& bar() && {
-    return static_cast<fbthrift_T&&>(__fbthrift_field_bar);
+  FOLLY_ERASE ::std::shared_ptr<::cpp2::Foo>&& bar() && {
+    return static_cast<::std::shared_ptr<::cpp2::Foo>&&>(__fbthrift_field_bar);
   }
 
   /** Glean { "field": "bar" } */
-  template <typename..., typename fbthrift_T = ::std::shared_ptr<::cpp2::Foo>>
-  FOLLY_ERASE const fbthrift_T&& bar() const&& {
-    return static_cast<const fbthrift_T&&>(__fbthrift_field_bar);
+  FOLLY_ERASE const ::std::shared_ptr<::cpp2::Foo>&& bar() const&& {
+    return static_cast<const ::std::shared_ptr<::cpp2::Foo>&&>(__fbthrift_field_bar);
   }
 
   template <class Protocol_>

third-party/thrift/src/thrift/compiler/test/fixtures/deprecated-public-fields-for-cpp-ref/out/cpp2/gen-cpp2/module_types.h

@@ -942,51 +942,43 @@ class OpEncodeStruct final  {
     return {static_cast<fbthrift_T&&>(this->__fbthrift_field_list_field), __isset.at(4), __isset.bit(4)};
   }
   /** Glean { "field": "list_shared_ptr_field" } */
-  template <typename..., typename fbthrift_T = ::std::shared_ptr<const ::std::vector<::facebook::thrift::test::AdaptedFoo>>>
-  FOLLY_ERASE fbthrift_T& list_shared_ptr_field_ref() & {
+  FOLLY_ERASE ::std::shared_ptr<const ::std::vector<::facebook::thrift::test::AdaptedFoo>>& list_shared_ptr_field_ref() & {
     return __fbthrift_field_list_shared_ptr_field;
   }
 
   /** Glean { "field": "list_shared_ptr_field" } */
-  template <typename..., typename fbthrift_T = ::std::shared_ptr<const ::std::vector<::facebook::thrift::test::AdaptedFoo>>>
-  FOLLY_ERASE const fbthrift_T& list_shared_ptr_field_ref() const& {
+  FOLLY_ERASE const ::std::shared_ptr<const ::std::vector<::facebook::thrift::test::AdaptedFoo>>& list_shared_ptr_field_ref() const& {
     return __fbthrift_field_list_shared_ptr_field;
   }
 
   /** Glean { "field": "list_shared_ptr_field" } */
-  template <typename..., typename fbthrift_T = ::std::shared_ptr<const ::std::vector<::facebook::thrift::test::AdaptedFoo>>>
-  FOLLY_ERASE fbthrift_T&& list_shared_ptr_field_ref() && {
-    return static_cast<fbthrift_T&&>(__fbthrift_field_list_shared_ptr_field);
+  FOLLY_ERASE ::std::shared_ptr<const ::std::vector<::facebook::thrift::test::AdaptedFoo>>&& list_shared_ptr_field_ref() && {
+    return static_cast<::std::shared_ptr<const ::std::vector<::facebook::thrift::test::AdaptedFoo>>&&>(__fbthrift_field_list_shared_ptr_field);
   }
 
   /** Glean { "field": "list_shared_ptr_field" } */
-  template <typename..., typename fbthrift_T = ::std::shared_ptr<const ::std::vector<::facebook::thrift::test::AdaptedFoo>>>
-  FOLLY_ERASE const fbthrift_T&& list_shared_ptr_field_ref() const&& {
-    return static_cast<const fbthrift_T&&>(__fbthrift_field_list_shared_ptr_field);
+  FOLLY_ERASE const ::std::shared_ptr<const ::std::vector<::facebook::thrift::test::AdaptedFoo>>&& list_shared_ptr_field_ref() const&& {
+    return static_cast<const ::std::shared_ptr<const ::std::vector<::facebook::thrift::test::AdaptedFoo>>&&>(__fbthrift_field_list_shared_ptr_field);
   }
 
   /** Glean { "field": "list_shared_ptr_field" } */
-  template <typename..., typename fbthrift_T = ::std::shared_ptr<const ::std::vector<::facebook::thrift::test::AdaptedFoo>>>
-  FOLLY_ERASE fbthrift_T& list_shared_ptr_field() & {
+  FOLLY_ERASE ::std::shared_ptr<const ::std::vector<::facebook::thrift::test::AdaptedFoo>>& list_shared_ptr_field() & {
     return __fbthrift_field_list_shared_ptr_field;
   }
 
   /** Glean { "field": "list_shared_ptr_field" } */
-  template <typename..., typename fbthrift_T = ::std::shared_ptr<const ::std::vector<::facebook::thrift::test::AdaptedFoo>>>
-  FOLLY_ERASE const fbthrift_T& list_shared_ptr_field() const& {
+  FOLLY_ERASE const ::std::shared_ptr<const ::std::vector<::facebook::thrift::test::AdaptedFoo>>& list_shared_ptr_field() const& {
     return __fbthrift_field_list_shared_ptr_field;
   }
 
   /** Glean { "field": "list_shared_ptr_field" } */
-  template <typename..., typename fbthrift_T = ::std::shared_ptr<const ::std::vector<::facebook::thrift::test::AdaptedFoo>>>
-  FOLLY_ERASE fbthrift_T&& list_shared_ptr_field() && {
-    return static_cast<fbthrift_T&&>(__fbthrift_field_list_shared_ptr_field);
+  FOLLY_ERASE ::std::shared_ptr<const ::std::vector<::facebook::thrift::test::AdaptedFoo>>&& list_shared_ptr_field() && {
+    return static_cast<::std::shared_ptr<const ::std::vector<::facebook::thrift::test::AdaptedFoo>>&&>(__fbthrift_field_list_shared_ptr_field);
   }
 
   /** Glean { "field": "list_shared_ptr_field" } */
-  template <typename..., typename fbthrift_T = ::std::shared_ptr<const ::std::vector<::facebook::thrift::test::AdaptedFoo>>>
-  FOLLY_ERASE const fbthrift_T&& list_shared_ptr_field() const&& {
-    return static_cast<const fbthrift_T&&>(__fbthrift_field_list_shared_ptr_field);
+  FOLLY_ERASE const ::std::shared_ptr<const ::std::vector<::facebook::thrift::test::AdaptedFoo>>&& list_shared_ptr_field() const&& {
+    return static_cast<const ::std::shared_ptr<const ::std::vector<::facebook::thrift::test::AdaptedFoo>>&&>(__fbthrift_field_list_shared_ptr_field);
   }
 
   /** Glean { "field": "list_cpp_type_field" } */