Internal change

PiperOrigin-RevId: 621236613

src/google/protobuf/descriptor.pb.cc

@@ -1954,23 +1954,23 @@ const char descriptor_table_protodef_google_2fprotobuf_2fdescriptor_2eproto[] AB
     "\013\n\003end\030\004 \001(\005\022H\n\010semantic\030\005 \001(\01626.google."
     "protobuf.GeneratedCodeInfo.Annotation.Se"
     "mantic\"(\n\010Semantic\022\010\n\004NONE\020\000\022\007\n\003SET\020\001\022\t\n"
-    "\005ALIAS\020\002*\247\002\n\007Edition\022\023\n\017EDITION_UNKNOWN\020"
-    "\000\022\023\n\016EDITION_LEGACY\020\204\007\022\023\n\016EDITION_PROTO2"
-    "\020\346\007\022\023\n\016EDITION_PROTO3\020\347\007\022\021\n\014EDITION_2023"
-    "\020\350\007\022\021\n\014EDITION_2024\020\351\007\022\027\n\023EDITION_1_TEST"
-    "_ONLY\020\001\022\027\n\023EDITION_2_TEST_ONLY\020\002\022\035\n\027EDIT"
-    "ION_99997_TEST_ONLY\020\235\215\006\022\035\n\027EDITION_99998"
-    "_TEST_ONLY\020\236\215\006\022\035\n\027EDITION_99999_TEST_ONL"
-    "Y\020\237\215\006\022\023\n\013EDITION_MAX\020\377\377\377\377\007B~\n\023com.google"
-    ".protobufB\020DescriptorProtosH\001Z-google.go"
-    "lang.org/protobuf/types/descriptorpb\370\001\001\242"
-    "\002\003GPB\252\002\032Google.Protobuf.Reflection"
+    "\005ALIAS\020\002*\232\002\n\007Edition\022\023\n\017EDITION_UNKNOWN\020"
+    "\000\022\023\n\016EDITION_PROTO2\020\346\007\022\023\n\016EDITION_PROTO3"
+    "\020\347\007\022\021\n\014EDITION_2023\020\350\007\022\021\n\014EDITION_2024\020\351"
+    "\007\022\027\n\023EDITION_1_TEST_ONLY\020\001\022\027\n\023EDITION_2_"
+    "TEST_ONLY\020\002\022\035\n\027EDITION_99997_TEST_ONLY\020\235"
+    "\215\006\022\035\n\027EDITION_99998_TEST_ONLY\020\236\215\006\022\035\n\027EDI"
+    "TION_99999_TEST_ONLY\020\237\215\006\022\023\n\013EDITION_MAX\020"
+    "\377\377\377\377\007\"\006\010\204\007\020\204\007B~\n\023com.google.protobufB\020De"
+    "scriptorProtosH\001Z-google.golang.org/prot"
+    "obuf/types/descriptorpb\370\001\001\242\002\003GPB\252\002\032Googl"
+    "e.Protobuf.Reflection"
 };
 static ::absl::once_flag descriptor_table_google_2fprotobuf_2fdescriptor_2eproto_once;
 PROTOBUF_CONSTINIT const ::_pbi::DescriptorTable descriptor_table_google_2fprotobuf_2fdescriptor_2eproto = {
     false,
     false,
-    9994,
+    9981,
     descriptor_table_protodef_google_2fprotobuf_2fdescriptor_2eproto,
     "google/protobuf/descriptor.proto",
     &descriptor_table_google_2fprotobuf_2fdescriptor_2eproto_once,
@@ -2394,7 +2394,7 @@ const ::google::protobuf::EnumDescriptor* Edition_descriptor() {
   return file_level_enum_descriptors_google_2fprotobuf_2fdescriptor_2eproto[16];
 }
 PROTOBUF_CONSTINIT const uint32_t Edition_internal_data_[] = {
-    196608u, 589824u, 99997u, 1000u, 99999u, 998u, 1001u, 99998u, 2147483647u, 900u, 999u, };
+    196608u, 524288u, 99997u, 1000u, 99999u, 999u, 1001u, 99998u, 2147483647u, 998u, };
 bool Edition_IsValid(int value) {
   return ::_pbi::ValidateEnum(value, Edition_internal_data_);
 }

src/google/protobuf/descriptor.pb.h

@@ -665,7 +665,6 @@ inline bool GeneratedCodeInfo_Annotation_Semantic_Parse(absl::string_view name,
 }
 enum Edition : int {
   EDITION_UNKNOWN = 0,
-  EDITION_LEGACY = 900,
   EDITION_PROTO2 = 998,
   EDITION_PROTO3 = 999,
   EDITION_2023 = 1000,

src/google/protobuf/descriptor.proto

@@ -64,7 +64,9 @@ enum Edition {
 
   // A placeholder edition for specifying default behaviors *before* a feature
   // was first introduced.  This is effectively an "infinite past".
-  EDITION_LEGACY = 900;
+  // TODO Re-enable this once F1 and Spanner are fixed.
+  // EDITION_LEGACY = 900;
+  reserved 900;
 
   // Legacy syntax "editions".  These pre-date editions, but behave much like
   // distinct editions.  These can't be used to specify the edition of proto

upb/reflection/stage0/google/protobuf/descriptor.upb.c

@@ -417,7 +417,7 @@ const upb_MiniTable* google__protobuf__GeneratedCodeInfo__Annotation_msg_init()
 
 const upb_MiniTableEnum* google_protobuf_Edition_enum_init() {
   static const upb_MiniTableEnum* mini_table = NULL;
-  static const char* mini_descriptor = "!)~z!|a1qt_b)|i}{~~`!";
+  static const char* mini_descriptor = "!)`~1qt_b)|i}{~~`!";
   if (mini_table) return mini_table;
   mini_table =
       upb_MiniTableEnum_Build(mini_descriptor, strlen(mini_descriptor),

upb/reflection/stage0/google/protobuf/descriptor.upb.h

@@ -106,7 +106,6 @@ typedef enum {
   google_protobuf_EDITION_UNKNOWN = 0,
   google_protobuf_EDITION_1_TEST_ONLY = 1,
   google_protobuf_EDITION_2_TEST_ONLY = 2,
-  google_protobuf_EDITION_LEGACY = 900,
   google_protobuf_EDITION_PROTO2 = 998,
   google_protobuf_EDITION_PROTO3 = 999,
   google_protobuf_EDITION_2023 = 1000,