Revert D91671374

Summary:
This diff reverts D91671374
Blocking thrift compiler release

Depends on D91671374

Differential Revision: D92538780

fbshipit-source-id: a0bd75970f280514992564bef3f7a372e5e4c0d2

Author: generatedunixname89002005232357

third-party/thrift/src/thrift/compiler/generate/t_hack_generator.cc

@@ -2095,6 +2095,8 @@ std::string t_hack_generator::render_const_value_helper(
       out << temp_val;
 
       set_indent(preserved_indent_size);
+    } else if (value->get_map().empty()) {
+      out << struct_name << "::withDefaultValues()";
     } else {
       out << struct_name << "::fromShape(\n";
       indent_up();
@@ -4554,8 +4556,8 @@ void t_hack_generator::generate_php_struct_constructor_field_assignment(
   }
   std::string dval;
   bool is_exception = tstruct->is<t_exception>();
-  if (field.default_value() != nullptr &&
-      !(t->is<t_structured>() || skip_custom_default)) {
+  if (field.default_value() != nullptr && !skip_custom_default &&
+      !(t->is<t_structured>() && legacy_default_values_)) {
     dval = render_const_value(
         t,
         field.default_value(),

third-party/thrift/src/thrift/compiler/test/fixtures/adapter/out/hack/gen-hack/Service.php

@@ -246,19 +246,13 @@ public static function getAllStructuredAnnotations()[write_props]: \TStructAnnot
         'arg1' => shape(
           'field' => dict[],
           'type' => dict[
-            '\facebook\thrift\annotation\AllowLegacyTypedefUri' => \facebook\thrift\annotation\AllowLegacyTypedefUri::fromShape(
-              shape(
-              )
-            ),
+            '\facebook\thrift\annotation\AllowLegacyTypedefUri' => \facebook\thrift\annotation\AllowLegacyTypedefUri::withDefaultValues(),
           ],
         ),
         'arg2' => shape(
           'field' => dict[],
           'type' => dict[
-            '\facebook\thrift\annotation\AllowLegacyTypedefUri' => \facebook\thrift\annotation\AllowLegacyTypedefUri::fromShape(
-              shape(
-              )
-            ),
+            '\facebook\thrift\annotation\AllowLegacyTypedefUri' => \facebook\thrift\annotation\AllowLegacyTypedefUri::withDefaultValues(),
             '\facebook\thrift\annotation\cpp\Adapter' => \facebook\thrift\annotation\cpp\Adapter::fromShape(
               shape(
                 "name" => "::my::Adapter2",
@@ -269,10 +263,7 @@ public static function getAllStructuredAnnotations()[write_props]: \TStructAnnot
         'arg3' => shape(
           'field' => dict[],
           'type' => dict[
-            '\facebook\thrift\annotation\cpp\EnableCustomTypeOrdering' => \facebook\thrift\annotation\cpp\EnableCustomTypeOrdering::fromShape(
-              shape(
-              )
-            ),
+            '\facebook\thrift\annotation\cpp\EnableCustomTypeOrdering' => \facebook\thrift\annotation\cpp\EnableCustomTypeOrdering::withDefaultValues(),
           ],
         ),
       ],
@@ -422,10 +413,7 @@ public static function getAllStructuredAnnotations()[write_props]: \TStructAnnot
         'success' => shape(
           'field' => dict[],
           'type' => dict[
-            '\facebook\thrift\annotation\AllowLegacyTypedefUri' => \facebook\thrift\annotation\AllowLegacyTypedefUri::fromShape(
-              shape(
-              )
-            ),
+            '\facebook\thrift\annotation\AllowLegacyTypedefUri' => \facebook\thrift\annotation\AllowLegacyTypedefUri::withDefaultValues(),
           ],
         ),
       ],