Completely migrate ExceptionMetadata to schema.thrift

Mizuchi · meta-codesync[bot] · commit c5754df446d7 · 2025-12-03T13:56:17.000-08:00
Reviewed By: iahs

Differential Revision: D86644869

fbshipit-source-id: 0bbd859914ef18d54e6bd571cff2b39bc212220c
diff --git a/third-party/thrift/src/thrift/compiler/generate/templates/cpp2/module_metadata.cpp.mustache b/third-party/thrift/src/thrift/compiler/generate/templates/cpp2/module_metadata.cpp.mustache
@@ -116,6 +116,11 @@ StructMetadata<{{struct:cpp_fullname}}>::gen(ThriftMetadata& metadata) {
 {{#program:structs}}
 {{#struct:exception?}}
 void ExceptionMetadata<{{struct:cpp_fullname}}>::gen(ThriftMetadata& metadata) {
+  if (FLAGS_thrift_enable_schema_to_metadata_conversion) {
+    genExceptionMetadata<{{struct:cpp_fullname}}>(metadata, kGenerateAll);
+    return;
+  }
+
   auto res = genExceptionMetadata<{{struct:cpp_fullname}}>(metadata, {.genAnnotations = folly::kIsDebug});
   if (res.preExists) {
     return;
diff --git a/third-party/thrift/src/thrift/compiler/test/fixtures/any/out/cpp2/gen-cpp2/module_metadata.cpp b/third-party/thrift/src/thrift/compiler/test/fixtures/any/out/cpp2/gen-cpp2/module_metadata.cpp
@@ -122,6 +122,11 @@ StructMetadata<::facebook::thrift::compiler::test::fixtures::any::MyException>::
 }
 
 void ExceptionMetadata<::facebook::thrift::compiler::test::fixtures::any::MyException>::gen(ThriftMetadata& metadata) {
+  if (FLAGS_thrift_enable_schema_to_metadata_conversion) {
+    genExceptionMetadata<::facebook::thrift::compiler::test::fixtures::any::MyException>(metadata, kGenerateAll);
+    return;
+  }
+
   auto res = genExceptionMetadata<::facebook::thrift::compiler::test::fixtures::any::MyException>(metadata, {.genAnnotations = folly::kIsDebug});
   if (res.preExists) {
     return;
diff --git a/third-party/thrift/src/thrift/compiler/test/fixtures/basic-annotations/out/cpp2/gen-cpp2/module_metadata.cpp b/third-party/thrift/src/thrift/compiler/test/fixtures/basic-annotations/out/cpp2/gen-cpp2/module_metadata.cpp
@@ -206,6 +206,11 @@ StructMetadata<::cpp2::SecretStruct>::gen(ThriftMetadata& metadata) {
 }
 
 void ExceptionMetadata<::cpp2::detail::YourException>::gen(ThriftMetadata& metadata) {
+  if (FLAGS_thrift_enable_schema_to_metadata_conversion) {
+    genExceptionMetadata<::cpp2::detail::YourException>(metadata, kGenerateAll);
+    return;
+  }
+
   auto res = genExceptionMetadata<::cpp2::detail::YourException>(metadata, {.genAnnotations = folly::kIsDebug});
   if (res.preExists) {
     return;
diff --git a/third-party/thrift/src/thrift/compiler/test/fixtures/basic-structured-annotations/out/cpp2/gen-cpp2/module_metadata.cpp b/third-party/thrift/src/thrift/compiler/test/fixtures/basic-structured-annotations/out/cpp2/gen-cpp2/module_metadata.cpp
@@ -321,6 +321,11 @@ StructMetadata<::test::fixtures::basic_structured_annotations::MyUnion>::gen(Thr
 }
 
 void ExceptionMetadata<::test::fixtures::basic_structured_annotations::MyException>::gen(ThriftMetadata& metadata) {
+  if (FLAGS_thrift_enable_schema_to_metadata_conversion) {
+    genExceptionMetadata<::test::fixtures::basic_structured_annotations::MyException>(metadata, kGenerateAll);
+    return;
+  }
+
   auto res = genExceptionMetadata<::test::fixtures::basic_structured_annotations::MyException>(metadata, {.genAnnotations = folly::kIsDebug});
   if (res.preExists) {
     return;
diff --git a/third-party/thrift/src/thrift/compiler/test/fixtures/basic/out/cpp2/gen-cpp2/module_metadata.cpp b/third-party/thrift/src/thrift/compiler/test/fixtures/basic/out/cpp2/gen-cpp2/module_metadata.cpp
@@ -317,6 +317,11 @@ StructMetadata<::test::fixtures::basic::UnionToBeRenamed>::gen(ThriftMetadata& m
 }
 
 void ExceptionMetadata<::test::fixtures::basic::MyException>::gen(ThriftMetadata& metadata) {
+  if (FLAGS_thrift_enable_schema_to_metadata_conversion) {
+    genExceptionMetadata<::test::fixtures::basic::MyException>(metadata, kGenerateAll);
+    return;
+  }
+
   auto res = genExceptionMetadata<::test::fixtures::basic::MyException>(metadata, {.genAnnotations = folly::kIsDebug});
   if (res.preExists) {
     return;
@@ -347,6 +352,11 @@ void ExceptionMetadata<::test::fixtures::basic::MyException>::gen(ThriftMetadata
   ));
 }
 void ExceptionMetadata<::test::fixtures::basic::MyExceptionWithMessage>::gen(ThriftMetadata& metadata) {
+  if (FLAGS_thrift_enable_schema_to_metadata_conversion) {
+    genExceptionMetadata<::test::fixtures::basic::MyExceptionWithMessage>(metadata, kGenerateAll);
+    return;
+  }
+
   auto res = genExceptionMetadata<::test::fixtures::basic::MyExceptionWithMessage>(metadata, {.genAnnotations = folly::kIsDebug});
   if (res.preExists) {
     return;
diff --git a/third-party/thrift/src/thrift/compiler/test/fixtures/bidi/out/cpp2/gen-cpp2/module_metadata.cpp b/third-party/thrift/src/thrift/compiler/test/fixtures/bidi/out/cpp2/gen-cpp2/module_metadata.cpp
@@ -126,6 +126,11 @@ StructMetadata<::cpp2::BiDiMethodException>::gen(ThriftMetadata& metadata) {
 }
 
 void ExceptionMetadata<::cpp2::BiDiSinkException>::gen(ThriftMetadata& metadata) {
+  if (FLAGS_thrift_enable_schema_to_metadata_conversion) {
+    genExceptionMetadata<::cpp2::BiDiSinkException>(metadata, kGenerateAll);
+    return;
+  }
+
   auto res = genExceptionMetadata<::cpp2::BiDiSinkException>(metadata, {.genAnnotations = folly::kIsDebug});
   if (res.preExists) {
     return;
@@ -156,6 +161,11 @@ void ExceptionMetadata<::cpp2::BiDiSinkException>::gen(ThriftMetadata& metadata)
   ));
 }
 void ExceptionMetadata<::cpp2::BiDiStreamException>::gen(ThriftMetadata& metadata) {
+  if (FLAGS_thrift_enable_schema_to_metadata_conversion) {
+    genExceptionMetadata<::cpp2::BiDiStreamException>(metadata, kGenerateAll);
+    return;
+  }
+
   auto res = genExceptionMetadata<::cpp2::BiDiStreamException>(metadata, {.genAnnotations = folly::kIsDebug});
   if (res.preExists) {
     return;
@@ -186,6 +196,11 @@ void ExceptionMetadata<::cpp2::BiDiStreamException>::gen(ThriftMetadata& metadat
   ));
 }
 void ExceptionMetadata<::cpp2::BiDiMethodException>::gen(ThriftMetadata& metadata) {
+  if (FLAGS_thrift_enable_schema_to_metadata_conversion) {
+    genExceptionMetadata<::cpp2::BiDiMethodException>(metadata, kGenerateAll);
+    return;
+  }
+
   auto res = genExceptionMetadata<::cpp2::BiDiMethodException>(metadata, {.genAnnotations = folly::kIsDebug});
   if (res.preExists) {
     return;
diff --git a/third-party/thrift/src/thrift/compiler/test/fixtures/complex-struct/out/cpp2/gen-cpp2/module_metadata.cpp b/third-party/thrift/src/thrift/compiler/test/fixtures/complex-struct/out/cpp2/gen-cpp2/module_metadata.cpp
@@ -503,6 +503,11 @@ StructMetadata<::cpp2::Containers>::gen(ThriftMetadata& metadata) {
 }
 
 void ExceptionMetadata<::cpp2::emptyXcep>::gen(ThriftMetadata& metadata) {
+  if (FLAGS_thrift_enable_schema_to_metadata_conversion) {
+    genExceptionMetadata<::cpp2::emptyXcep>(metadata, kGenerateAll);
+    return;
+  }
+
   auto res = genExceptionMetadata<::cpp2::emptyXcep>(metadata, {.genAnnotations = folly::kIsDebug});
   if (res.preExists) {
     return;
@@ -517,6 +522,11 @@ void ExceptionMetadata<::cpp2::emptyXcep>::gen(ThriftMetadata& metadata) {
   ));
 }
 void ExceptionMetadata<::cpp2::reqXcep>::gen(ThriftMetadata& metadata) {
+  if (FLAGS_thrift_enable_schema_to_metadata_conversion) {
+    genExceptionMetadata<::cpp2::reqXcep>(metadata, kGenerateAll);
+    return;
+  }
+
   auto res = genExceptionMetadata<::cpp2::reqXcep>(metadata, {.genAnnotations = folly::kIsDebug});
   if (res.preExists) {
     return;
@@ -547,6 +557,11 @@ void ExceptionMetadata<::cpp2::reqXcep>::gen(ThriftMetadata& metadata) {
   ));
 }
 void ExceptionMetadata<::cpp2::optXcep>::gen(ThriftMetadata& metadata) {
+  if (FLAGS_thrift_enable_schema_to_metadata_conversion) {
+    genExceptionMetadata<::cpp2::optXcep>(metadata, kGenerateAll);
+    return;
+  }
+
   auto res = genExceptionMetadata<::cpp2::optXcep>(metadata, {.genAnnotations = folly::kIsDebug});
   if (res.preExists) {
     return;
@@ -577,6 +592,11 @@ void ExceptionMetadata<::cpp2::optXcep>::gen(ThriftMetadata& metadata) {
   ));
 }
 void ExceptionMetadata<::cpp2::complexException>::gen(ThriftMetadata& metadata) {
+  if (FLAGS_thrift_enable_schema_to_metadata_conversion) {
+    genExceptionMetadata<::cpp2::complexException>(metadata, kGenerateAll);
+    return;
+  }
+
   auto res = genExceptionMetadata<::cpp2::complexException>(metadata, {.genAnnotations = folly::kIsDebug});
   if (res.preExists) {
     return;
diff --git a/third-party/thrift/src/thrift/compiler/test/fixtures/cpp2-struct-footprint/out/cpp2/gen-cpp2/module_metadata.cpp b/third-party/thrift/src/thrift/compiler/test/fixtures/cpp2-struct-footprint/out/cpp2/gen-cpp2/module_metadata.cpp
@@ -246,6 +246,11 @@ StructMetadata<::cpp2_struct_footprint::TestUnion>::gen(ThriftMetadata& metadata
 }
 
 void ExceptionMetadata<::cpp2_struct_footprint::ExStruct>::gen(ThriftMetadata& metadata) {
+  if (FLAGS_thrift_enable_schema_to_metadata_conversion) {
+    genExceptionMetadata<::cpp2_struct_footprint::ExStruct>(metadata, kGenerateAll);
+    return;
+  }
+
   auto res = genExceptionMetadata<::cpp2_struct_footprint::ExStruct>(metadata, {.genAnnotations = folly::kIsDebug});
   if (res.preExists) {
     return;
diff --git a/third-party/thrift/src/thrift/compiler/test/fixtures/doctext/out/cpp2/gen-cpp2/module_metadata.cpp b/third-party/thrift/src/thrift/compiler/test/fixtures/doctext/out/cpp2/gen-cpp2/module_metadata.cpp
@@ -144,6 +144,11 @@ StructMetadata<::cpp2::Bang>::gen(ThriftMetadata& metadata) {
 }
 
 void ExceptionMetadata<::cpp2::Bang>::gen(ThriftMetadata& metadata) {
+  if (FLAGS_thrift_enable_schema_to_metadata_conversion) {
+    genExceptionMetadata<::cpp2::Bang>(metadata, kGenerateAll);
+    return;
+  }
+
   auto res = genExceptionMetadata<::cpp2::Bang>(metadata, {.genAnnotations = folly::kIsDebug});
   if (res.preExists) {
     return;
diff --git a/third-party/thrift/src/thrift/compiler/test/fixtures/exceptions/out/cpp2/gen-cpp2/module_metadata.cpp b/third-party/thrift/src/thrift/compiler/test/fixtures/exceptions/out/cpp2/gen-cpp2/module_metadata.cpp
@@ -233,6 +233,11 @@ StructMetadata<::cpp2::Banal>::gen(ThriftMetadata& metadata) {
 }
 
 void ExceptionMetadata<::cpp2::Fiery>::gen(ThriftMetadata& metadata) {
+  if (FLAGS_thrift_enable_schema_to_metadata_conversion) {
+    genExceptionMetadata<::cpp2::Fiery>(metadata, kGenerateAll);
+    return;
+  }
+
   auto res = genExceptionMetadata<::cpp2::Fiery>(metadata, {.genAnnotations = folly::kIsDebug});
   if (res.preExists) {
     return;
@@ -263,6 +268,11 @@ void ExceptionMetadata<::cpp2::Fiery>::gen(ThriftMetadata& metadata) {
   ));
 }
 void ExceptionMetadata<::cpp2::Serious>::gen(ThriftMetadata& metadata) {
+  if (FLAGS_thrift_enable_schema_to_metadata_conversion) {
+    genExceptionMetadata<::cpp2::Serious>(metadata, kGenerateAll);
+    return;
+  }
+
   auto res = genExceptionMetadata<::cpp2::Serious>(metadata, {.genAnnotations = folly::kIsDebug});
   if (res.preExists) {
     return;
@@ -293,6 +303,11 @@ void ExceptionMetadata<::cpp2::Serious>::gen(ThriftMetadata& metadata) {
   ));
 }
 void ExceptionMetadata<::cpp2::ComplexFieldNames>::gen(ThriftMetadata& metadata) {
+  if (FLAGS_thrift_enable_schema_to_metadata_conversion) {
+    genExceptionMetadata<::cpp2::ComplexFieldNames>(metadata, kGenerateAll);
+    return;
+  }
+
   auto res = genExceptionMetadata<::cpp2::ComplexFieldNames>(metadata, {.genAnnotations = folly::kIsDebug});
   if (res.preExists) {
     return;
@@ -323,6 +338,11 @@ void ExceptionMetadata<::cpp2::ComplexFieldNames>::gen(ThriftMetadata& metadata)
   ));
 }
 void ExceptionMetadata<::cpp2::CustomFieldNames>::gen(ThriftMetadata& metadata) {
+  if (FLAGS_thrift_enable_schema_to_metadata_conversion) {
+    genExceptionMetadata<::cpp2::CustomFieldNames>(metadata, kGenerateAll);
+    return;
+  }
+
   auto res = genExceptionMetadata<::cpp2::CustomFieldNames>(metadata, {.genAnnotations = folly::kIsDebug});
   if (res.preExists) {
     return;
@@ -353,6 +373,11 @@ void ExceptionMetadata<::cpp2::CustomFieldNames>::gen(ThriftMetadata& metadata)
   ));
 }
 void ExceptionMetadata<::cpp2::ExceptionWithPrimitiveField>::gen(ThriftMetadata& metadata) {
+  if (FLAGS_thrift_enable_schema_to_metadata_conversion) {
+    genExceptionMetadata<::cpp2::ExceptionWithPrimitiveField>(metadata, kGenerateAll);
+    return;
+  }
+
   auto res = genExceptionMetadata<::cpp2::ExceptionWithPrimitiveField>(metadata, {.genAnnotations = folly::kIsDebug});
   if (res.preExists) {
     return;
@@ -383,6 +408,11 @@ void ExceptionMetadata<::cpp2::ExceptionWithPrimitiveField>::gen(ThriftMetadata&
   ));
 }
 void ExceptionMetadata<::cpp2::ExceptionWithStructuredAnnotation>::gen(ThriftMetadata& metadata) {
+  if (FLAGS_thrift_enable_schema_to_metadata_conversion) {
+    genExceptionMetadata<::cpp2::ExceptionWithStructuredAnnotation>(metadata, kGenerateAll);
+    return;
+  }
+
   auto res = genExceptionMetadata<::cpp2::ExceptionWithStructuredAnnotation>(metadata, {.genAnnotations = folly::kIsDebug});
   if (res.preExists) {
     return;
@@ -413,6 +443,11 @@ void ExceptionMetadata<::cpp2::ExceptionWithStructuredAnnotation>::gen(ThriftMet
   ));
 }
 void ExceptionMetadata<::cpp2::Banal>::gen(ThriftMetadata& metadata) {
+  if (FLAGS_thrift_enable_schema_to_metadata_conversion) {
+    genExceptionMetadata<::cpp2::Banal>(metadata, kGenerateAll);
+    return;
+  }
+
   auto res = genExceptionMetadata<::cpp2::Banal>(metadata, {.genAnnotations = folly::kIsDebug});
   if (res.preExists) {
     return;
diff --git a/third-party/thrift/src/thrift/compiler/test/fixtures/interactions/out/cpp2/gen-cpp2/module_metadata.cpp b/third-party/thrift/src/thrift/compiler/test/fixtures/interactions/out/cpp2/gen-cpp2/module_metadata.cpp
@@ -116,6 +116,11 @@ StructMetadata<::cpp2::ShouldBeBoxed>::gen(ThriftMetadata& metadata) {
 }
 
 void ExceptionMetadata<::cpp2::CustomException>::gen(ThriftMetadata& metadata) {
+  if (FLAGS_thrift_enable_schema_to_metadata_conversion) {
+    genExceptionMetadata<::cpp2::CustomException>(metadata, kGenerateAll);
+    return;
+  }
+
   auto res = genExceptionMetadata<::cpp2::CustomException>(metadata, {.genAnnotations = folly::kIsDebug});
   if (res.preExists) {
     return;
diff --git a/third-party/thrift/src/thrift/compiler/test/fixtures/mcpp2-compare/out/cpp2/gen-cpp2/module_metadata.cpp b/third-party/thrift/src/thrift/compiler/test/fixtures/mcpp2-compare/out/cpp2/gen-cpp2/module_metadata.cpp
@@ -566,6 +566,11 @@ StructMetadata<::some::valid::ns::AllRequiredNoExceptMoveCtrStruct>::gen(ThriftM
 }
 
 void ExceptionMetadata<::some::valid::ns::AnException>::gen(ThriftMetadata& metadata) {
+  if (FLAGS_thrift_enable_schema_to_metadata_conversion) {
+    genExceptionMetadata<::some::valid::ns::AnException>(metadata, kGenerateAll);
+    return;
+  }
+
   auto res = genExceptionMetadata<::some::valid::ns::AnException>(metadata, {.genAnnotations = folly::kIsDebug});
   if (res.preExists) {
     return;
@@ -596,6 +601,11 @@ void ExceptionMetadata<::some::valid::ns::AnException>::gen(ThriftMetadata& meta
   ));
 }
 void ExceptionMetadata<::some::valid::ns::AnotherException>::gen(ThriftMetadata& metadata) {
+  if (FLAGS_thrift_enable_schema_to_metadata_conversion) {
+    genExceptionMetadata<::some::valid::ns::AnotherException>(metadata, kGenerateAll);
+    return;
+  }
+
   auto res = genExceptionMetadata<::some::valid::ns::AnotherException>(metadata, {.genAnnotations = folly::kIsDebug});
   if (res.preExists) {
     return;
diff --git a/third-party/thrift/src/thrift/compiler/test/fixtures/py3/out/cpp2/gen-py3cpp/module_metadata.cpp b/third-party/thrift/src/thrift/compiler/test/fixtures/py3/out/cpp2/gen-py3cpp/module_metadata.cpp
@@ -493,6 +493,11 @@ StructMetadata<::py3::simple::AdaptedTypedefFields>::gen(ThriftMetadata& metadat
 }
 
 void ExceptionMetadata<::py3::simple::SimpleException>::gen(ThriftMetadata& metadata) {
+  if (FLAGS_thrift_enable_schema_to_metadata_conversion) {
+    genExceptionMetadata<::py3::simple::SimpleException>(metadata, kGenerateAll);
+    return;
+  }
+
   auto res = genExceptionMetadata<::py3::simple::SimpleException>(metadata, {.genAnnotations = folly::kIsDebug});
   if (res.preExists) {
     return;
@@ -523,6 +528,11 @@ void ExceptionMetadata<::py3::simple::SimpleException>::gen(ThriftMetadata& meta
   ));
 }
 void ExceptionMetadata<::py3::simple::HiddenException>::gen(ThriftMetadata& metadata) {
+  if (FLAGS_thrift_enable_schema_to_metadata_conversion) {
+    genExceptionMetadata<::py3::simple::HiddenException>(metadata, kGenerateAll);
+    return;
+  }
+
   auto res = genExceptionMetadata<::py3::simple::HiddenException>(metadata, {.genAnnotations = folly::kIsDebug});
   if (res.preExists) {
     return;
diff --git a/third-party/thrift/src/thrift/compiler/test/fixtures/python_capi/out/cpp2_serialized_dep/gen-cpp2/serialized_dep_metadata.cpp b/third-party/thrift/src/thrift/compiler/test/fixtures/python_capi/out/cpp2_serialized_dep/gen-cpp2/serialized_dep_metadata.cpp
@@ -217,6 +217,11 @@ StructMetadata<::test::fixtures::python_capi::MarshalError>::gen(ThriftMetadata&
 }
 
 void ExceptionMetadata<::test::fixtures::python_capi::SerializedError>::gen(ThriftMetadata& metadata) {
+  if (FLAGS_thrift_enable_schema_to_metadata_conversion) {
+    genExceptionMetadata<::test::fixtures::python_capi::SerializedError>(metadata, kGenerateAll);
+    return;
+  }
+
   auto res = genExceptionMetadata<::test::fixtures::python_capi::SerializedError>(metadata, {.genAnnotations = folly::kIsDebug});
   if (res.preExists) {
     return;
@@ -248,6 +253,11 @@ void ExceptionMetadata<::test::fixtures::python_capi::SerializedError>::gen(Thri
   ));
 }
 void ExceptionMetadata<::test::fixtures::python_capi::MarshalError>::gen(ThriftMetadata& metadata) {
+  if (FLAGS_thrift_enable_schema_to_metadata_conversion) {
+    genExceptionMetadata<::test::fixtures::python_capi::MarshalError>(metadata, kGenerateAll);
+    return;
+  }
+
   auto res = genExceptionMetadata<::test::fixtures::python_capi::MarshalError>(metadata, {.genAnnotations = folly::kIsDebug});
   if (res.preExists) {
     return;
diff --git a/third-party/thrift/src/thrift/compiler/test/fixtures/runtime-annotations/out/cpp2/gen-cpp2/module_metadata.cpp b/third-party/thrift/src/thrift/compiler/test/fixtures/runtime-annotations/out/cpp2/gen-cpp2/module_metadata.cpp
@@ -162,6 +162,11 @@ StructMetadata<::facebook::thrift::test::MyException>::gen(ThriftMetadata& metad
 }
 
 void ExceptionMetadata<::facebook::thrift::test::MyException>::gen(ThriftMetadata& metadata) {
+  if (FLAGS_thrift_enable_schema_to_metadata_conversion) {
+    genExceptionMetadata<::facebook::thrift::test::MyException>(metadata, kGenerateAll);
+    return;
+  }
+
   auto res = genExceptionMetadata<::facebook::thrift::test::MyException>(metadata, {.genAnnotations = folly::kIsDebug});
   if (res.preExists) {
     return;
diff --git a/third-party/thrift/src/thrift/compiler/test/fixtures/service-schema/out/cpp2/gen-cpp2/module_metadata.cpp b/third-party/thrift/src/thrift/compiler/test/fixtures/service-schema/out/cpp2/gen-cpp2/module_metadata.cpp
@@ -89,6 +89,11 @@ StructMetadata<::facebook::thrift::test::CustomException>::gen(ThriftMetadata& m
 }
 
 void ExceptionMetadata<::facebook::thrift::test::CustomException>::gen(ThriftMetadata& metadata) {
+  if (FLAGS_thrift_enable_schema_to_metadata_conversion) {
+    genExceptionMetadata<::facebook::thrift::test::CustomException>(metadata, kGenerateAll);
+    return;
+  }
+
   auto res = genExceptionMetadata<::facebook::thrift::test::CustomException>(metadata, {.genAnnotations = folly::kIsDebug});
   if (res.preExists) {
     return;
diff --git a/third-party/thrift/src/thrift/compiler/test/fixtures/service-schema/out/cpp2_sinit/gen-cpp2/module_metadata.cpp b/third-party/thrift/src/thrift/compiler/test/fixtures/service-schema/out/cpp2_sinit/gen-cpp2/module_metadata.cpp
@@ -89,6 +89,11 @@ StructMetadata<::facebook::thrift::test::CustomException>::gen(ThriftMetadata& m
 }
 
 void ExceptionMetadata<::facebook::thrift::test::CustomException>::gen(ThriftMetadata& metadata) {
+  if (FLAGS_thrift_enable_schema_to_metadata_conversion) {
+    genExceptionMetadata<::facebook::thrift::test::CustomException>(metadata, kGenerateAll);
+    return;
+  }
+
   auto res = genExceptionMetadata<::facebook::thrift::test::CustomException>(metadata, {.genAnnotations = folly::kIsDebug});
   if (res.preExists) {
     return;
diff --git a/third-party/thrift/src/thrift/compiler/test/fixtures/sink/out/cpp2/gen-cpp2/module_metadata.cpp b/third-party/thrift/src/thrift/compiler/test/fixtures/sink/out/cpp2/gen-cpp2/module_metadata.cpp
diff --git a/third-party/thrift/src/thrift/compiler/test/fixtures/stream/out/cpp2/gen-cpp2/module_metadata.cpp b/third-party/thrift/src/thrift/compiler/test/fixtures/stream/out/cpp2/gen-cpp2/module_metadata.cpp
diff --git a/third-party/thrift/src/thrift/compiler/test/fixtures/sync-methods-return-try/out/cpp2/gen-cpp2/module_metadata.cpp b/third-party/thrift/src/thrift/compiler/test/fixtures/sync-methods-return-try/out/cpp2/gen-cpp2/module_metadata.cpp
diff --git a/third-party/thrift/src/thrift/compiler/test/fixtures/terse_write/out/cpp2/gen-cpp2/terse_write_metadata.cpp b/third-party/thrift/src/thrift/compiler/test/fixtures/terse_write/out/cpp2/gen-cpp2/terse_write_metadata.cpp
diff --git a/third-party/thrift/src/thrift/lib/cpp2/test/metadata/annotations_test.cpp b/third-party/thrift/src/thrift/lib/cpp2/test/metadata/annotations_test.cpp
