ClickHouse
diff --git a/‎src/google/protobuf/compiler/BUILD.bazel‎
Lines changed: 1 addition & 0 deletions b/‎src/google/protobuf/compiler/BUILD.bazel‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎upb/BUILD‎
Lines changed: 3 additions & 0 deletions b/‎upb/BUILD‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎upb/port/def.inc‎
Lines changed: 5 additions & 0 deletions b/‎upb/port/def.inc‎
Lines changed: 5 additions & 0 deletions
diff --git a/‎upb/port/undef.inc‎
Lines changed: 1 addition & 0 deletions b/‎upb/port/undef.inc‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎upb/reflection/BUILD‎
Lines changed: 36 additions & 0 deletions b/‎upb/reflection/BUILD‎
Lines changed: 36 additions & 0 deletions
diff --git a/‎upb/reflection/def_pool.c‎
Lines changed: 20 additions & 1 deletion b/‎upb/reflection/def_pool.c‎
Lines changed: 20 additions & 1 deletion
diff --git a/‎upb/reflection/def_pool.h‎
Lines changed: 3 additions & 0 deletions b/‎upb/reflection/def_pool.h‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎upb/reflection/enum_def.c‎
Lines changed: 24 additions & 16 deletions b/‎upb/reflection/enum_def.c‎
Lines changed: 24 additions & 16 deletions
diff --git a/‎upb/reflection/enum_def.h‎
Lines changed: 1 addition & 0 deletions b/‎upb/reflection/enum_def.h‎
Lines changed: 1 addition & 0 deletions
@@ -164,6 +164,7 @@ cc_binary(
     copts = COPTS,
     visibility = [
         "//src/google/protobuf:__subpackages__",
+        "//upb:__subpackages__",
     ],
     deps = [
         ":command_line_interface",
 
@@ -406,6 +406,7 @@ upb_amalgamation(
         ":mem_internal",
         ":message",
         ":message_accessors",
+        ":message_copy",
         ":message_internal",
         ":message_internal_types",
         ":message_tagged_ptr",
@@ -456,6 +457,7 @@ upb_amalgamation(
         ":mem_internal",
         ":message",
         ":message_accessors",
+        ":message_copy",
         ":message_internal",
         ":message_internal_types",
         ":message_tagged_ptr",
@@ -506,6 +508,7 @@ upb_amalgamation(
         ":mem_internal",
         ":message",
         ":message_accessors",
+        ":message_copy",
         ":message_internal",
         ":message_internal_types",
         ":message_tagged_ptr",
 
@@ -323,6 +323,11 @@ void __asan_unpoison_memory_region(void const volatile *addr, size_t size);
 
 #if defined(UPB_IS_GOOGLE3) && !defined(UPB_BOOTSTRAP_STAGE0)
 #define UPB_DESC(sym) proto2_##sym
+#define UPB_DESC_MINITABLE(sym) &proto2__##sym##_msg_init
+#elif defined(UPB_BOOTSTRAP_STAGE0)
+#define UPB_DESC(sym) google_protobuf_##sym
+#define UPB_DESC_MINITABLE(sym) google__protobuf__##sym##_msg_init()
 #else
 #define UPB_DESC(sym) google_protobuf_##sym
+#define UPB_DESC_MINITABLE(sym) &google__protobuf__##sym##_msg_init
 #endif
@@ -49,6 +49,7 @@
 #undef UPB_GNUC_MIN
 #undef UPB_DESCRIPTOR_UPB_H_FILENAME
 #undef UPB_DESC
+#undef UPB_DESC_MINITABLE
 #undef UPB_IS_GOOGLE3
 #undef UPB_ATOMIC
 #undef UPB_USE_C11_ATOMICS
 
@@ -5,6 +5,15 @@
 # license that can be found in the LICENSE file or at
 # https://developers.google.com/open-source/licenses/bsd
 
+load(
+    "//upb/cmake:build_defs.bzl",
+    "staleness_test",
+)
+load(
+    "//src/google/protobuf/editions:defaults.bzl",
+    "compile_edition_defaults",
+    "embed_edition_defaults",
+)
 load("//bazel:build_defs.bzl", "UPB_DEFAULT_COPTS")
 load("//bazel:upb_minitable_proto_library.bzl", "upb_minitable_proto_library")
 load("//bazel:upb_proto_library.bzl", "upb_proto_reflection_library")
@@ -108,6 +117,7 @@ bootstrap_cc_library(
         "internal/method_def.h",
         "internal/oneof_def.h",
         "internal/service_def.h",
+        "internal/upb_edition_defaults.h",
         "message.h",
         "message.hpp",
         "message_def.h",
@@ -125,11 +135,13 @@ bootstrap_cc_library(
         "//upb:mem",
         "//upb:message",
         "//upb:message_accessors",
+        "//upb:message_copy",
         "//upb:message_value",
         "//upb:mini_descriptor",
         "//upb:mini_descriptor_internal",
         "//upb:mini_table",
         "//upb:port",
+        "//upb/base:internal",
     ],
 )
 
@@ -171,6 +183,30 @@ cc_test(
     ],
 )
 
+compile_edition_defaults(
+    name = "upb_edition_defaults",
+    srcs = [
+        "//:descriptor_proto",
+    ],
+    maximum_edition = "2023",
+    minimum_edition = "PROTO2",
+)
+
+embed_edition_defaults(
+    name = "embedded_upb_edition_defaults_generate",
+    defaults = "upb_edition_defaults",
+    output = "generated/internal/upb_edition_defaults.h",
+    placeholder = "DEFAULTS_VALUE",
+    template = "internal/upb_edition_defaults.h.template",
+)
+
+staleness_test(
+    name = "bootstrap_upb_defaults_staleness_test",
+    outs = ["internal/upb_edition_defaults.h"],
+    generated_pattern = "generated/%s",
+    target_files = ["internal/upb_edition_defaults.h"],
+)
+
 # begin:github_only
 filegroup(
     name = "source_files",
 
@@ -17,6 +17,7 @@
 #include "upb/reflection/internal/file_def.h"
 #include "upb/reflection/internal/message_def.h"
 #include "upb/reflection/internal/service_def.h"
+#include "upb/reflection/internal/upb_edition_defaults.h"
 
 // Must be last.
 #include "upb/port/def.inc"
@@ -27,6 +28,7 @@ struct upb_DefPool {
   upb_strtable files;  // file_name -> (upb_FileDef*)
   upb_inttable exts;   // (upb_MiniTableExtension*) -> (upb_FieldDef*)
   upb_ExtensionRegistry* extreg;
+  const UPB_DESC(FeatureSetDefaults) * feature_set_defaults;
   upb_MiniTablePlatform platform;
   void* scratch_data;
   size_t scratch_size;
@@ -39,6 +41,8 @@ void upb_DefPool_Free(upb_DefPool* s) {
   upb_gfree(s);
 }
 
+static const char serialized_defaults[] = UPB_INTERNAL_UPB_EDITION_DEFAULTS;
+
 upb_DefPool* upb_DefPool_New(void) {
   upb_DefPool* s = upb_gmalloc(sizeof(*s));
   if (!s) return NULL;
@@ -58,6 +62,10 @@ upb_DefPool* upb_DefPool_New(void) {
   if (!s->extreg) goto err;
 
   s->platform = kUpb_MiniTablePlatform_Native;
+  s->feature_set_defaults = UPB_DESC(FeatureSetDefaults_parse)(
+      serialized_defaults, sizeof(serialized_defaults) - 1, s->arena);
+
+  if (!s->feature_set_defaults) goto err;
 
   return s;
 
@@ -66,6 +74,11 @@ upb_DefPool* upb_DefPool_New(void) {
   return NULL;
 }
 
+const UPB_DESC(FeatureSetDefaults) *
+    upb_DefPool_FeatureSetDefaults(const upb_DefPool* s) {
+  return s->feature_set_defaults;
+}
+
 bool _upb_DefPool_InsertExt(upb_DefPool* s, const upb_MiniTableExtension* ext,
                             const upb_FieldDef* f) {
   return upb_inttable_insert(&s->exts, (uintptr_t)ext, upb_value_constptr(f),
@@ -279,7 +292,11 @@ static const upb_FileDef* upb_DefBuilder_AddFileToPool(
       remove_filedef(s, builder->file);
       builder->file = NULL;
     }
-  } else if (!builder->arena || !builder->tmp_arena) {
+  } else if (!builder->arena || !builder->tmp_arena ||
+             !upb_strtable_init(&builder->feature_cache, 16,
+                                builder->tmp_arena) ||
+             !(builder->legacy_features =
+                   UPB_DESC(FeatureSet_new)(builder->tmp_arena))) {
     _upb_DefBuilder_OomErr(builder);
   } else {
     _upb_FileDef_Create(builder, file_proto);
@@ -312,6 +329,8 @@ static const upb_FileDef* _upb_DefPool_AddFile(
 
   upb_DefBuilder ctx = {
       .symtab = s,
+      .tmp_buf = NULL,
+      .tmp_buf_size = 0,
       .layout = layout,
       .platform = s->platform,
       .msg_count = 0,
 
@@ -26,6 +26,9 @@ UPB_API void upb_DefPool_Free(upb_DefPool* s);
 
 UPB_API upb_DefPool* upb_DefPool_New(void);
 
+UPB_API const UPB_DESC(FeatureSetDefaults) *
+    upb_DefPool_FeatureSetDefaults(const upb_DefPool* s);
+
 UPB_API const upb_MessageDef* upb_DefPool_FindMessageByName(
     const upb_DefPool* s, const char* sym);
 
 
@@ -23,7 +23,8 @@
 #include "upb/port/def.inc"
 
 struct upb_EnumDef {
-  const UPB_DESC(EnumOptions) * opts;
+  const UPB_DESC(EnumOptions*) opts;
+  const UPB_DESC(FeatureSet*) resolved_features;
   const upb_MiniTableEnum* layout;  // Only for proto2.
   const upb_FileDef* file;
   const upb_MessageDef* containing_type;  // Could be merged with "file".
@@ -37,8 +38,10 @@ struct upb_EnumDef {
   int res_range_count;
   int res_name_count;
   int32_t defaultval;
-  bool is_closed;
   bool is_sorted;  // Whether all of the values are defined in ascending order.
+#if UINTPTR_MAX == 0xffffffff
+  uint32_t padding;  // Increase size to a multiple of 8.
+#endif
 };
 
 upb_EnumDef* _upb_EnumDef_At(const upb_EnumDef* e, int i) {
@@ -140,7 +143,11 @@ const upb_EnumValueDef* upb_EnumDef_Value(const upb_EnumDef* e, int i) {
   return _upb_EnumValueDef_At(e->values, i);
 }
 
-bool upb_EnumDef_IsClosed(const upb_EnumDef* e) { return e->is_closed; }
+bool upb_EnumDef_IsClosed(const upb_EnumDef* e) {
+  if (UPB_TREAT_PROTO2_ENUMS_LIKE_PROTO3) return false;
+  return UPB_DESC(FeatureSet_enum_type)(e->resolved_features) ==
+         UPB_DESC(FeatureSet_CLOSED);
+}
 
 bool upb_EnumDef_MiniDescriptorEncode(const upb_EnumDef* e, upb_Arena* a,
                                       upb_StringView* out) {
@@ -209,13 +216,18 @@ static upb_StringView* _upb_EnumReservedNames_New(
 
 static void create_enumdef(upb_DefBuilder* ctx, const char* prefix,
                            const UPB_DESC(EnumDescriptorProto) * enum_proto,
+                           const UPB_DESC(FeatureSet*) parent_features,
                            upb_EnumDef* e) {
   const UPB_DESC(EnumValueDescriptorProto)* const* values;
   const UPB_DESC(EnumDescriptorProto_EnumReservedRange)* const* res_ranges;
   const upb_StringView* res_names;
   upb_StringView name;
   size_t n_value, n_res_range, n_res_name;
 
+  UPB_DEF_SET_OPTIONS(e->opts, EnumDescriptorProto, EnumOptions, enum_proto);
+  e->resolved_features = _upb_DefBuilder_ResolveFeatures(
+      ctx, parent_features, UPB_DESC(EnumOptions_features)(e->opts));
+
   // Must happen before _upb_DefBuilder_Add()
   e->file = _upb_DefBuilder_File(ctx);
 
@@ -225,9 +237,6 @@ static void create_enumdef(upb_DefBuilder* ctx, const char* prefix,
   _upb_DefBuilder_Add(ctx, e->full_name,
                       _upb_DefType_Pack(e, UPB_DEFTYPE_ENUM));
 
-  e->is_closed = (!UPB_TREAT_PROTO2_ENUMS_LIKE_PROTO3) &&
-                 (upb_FileDef_Syntax(e->file) == kUpb_Syntax_Proto2);
-
   values = UPB_DESC(EnumDescriptorProto_value)(enum_proto, &n_value);
 
   bool ok = upb_strtable_init(&e->ntoi, n_value, ctx->arena);
@@ -238,8 +247,8 @@ static void create_enumdef(upb_DefBuilder* ctx, const char* prefix,
 
   e->defaultval = 0;
   e->value_count = n_value;
-  e->values =
-      _upb_EnumValueDefs_New(ctx, prefix, n_value, values, e, &e->is_sorted);
+  e->values = _upb_EnumValueDefs_New(ctx, prefix, n_value, values,
+                                     e->resolved_features, e, &e->is_sorted);
 
   if (n_value == 0) {
     _upb_DefBuilder_Errf(ctx, "enums must contain at least one value (%s)",
@@ -256,11 +265,9 @@ static void create_enumdef(upb_DefBuilder* ctx, const char* prefix,
   e->res_name_count = n_res_name;
   e->res_names = _upb_EnumReservedNames_New(ctx, n_res_name, res_names);
 
-  UPB_DEF_SET_OPTIONS(e->opts, EnumDescriptorProto, EnumOptions, enum_proto);
-
   upb_inttable_compact(&e->iton, ctx->arena);
 
-  if (e->is_closed) {
+  if (upb_EnumDef_IsClosed(e)) {
     if (ctx->layout) {
       UPB_ASSERT(ctx->enum_count < ctx->layout->enum_count);
       e->layout = ctx->layout->enums[ctx->enum_count++];
@@ -272,10 +279,11 @@ static void create_enumdef(upb_DefBuilder* ctx, const char* prefix,
   }
 }
 
-upb_EnumDef* _upb_EnumDefs_New(
-    upb_DefBuilder* ctx, int n,
-    const UPB_DESC(EnumDescriptorProto) * const* protos,
-    const upb_MessageDef* containing_type) {
+upb_EnumDef* _upb_EnumDefs_New(upb_DefBuilder* ctx, int n,
+                               const UPB_DESC(EnumDescriptorProto*)
+                                   const* protos,
+                               const UPB_DESC(FeatureSet*) parent_features,
+                               const upb_MessageDef* containing_type) {
   _upb_DefType_CheckPadding(sizeof(upb_EnumDef));
 
   // If a containing type is defined then get the full name from that.
@@ -285,7 +293,7 @@ upb_EnumDef* _upb_EnumDefs_New(
 
   upb_EnumDef* e = _upb_DefBuilder_Alloc(ctx, sizeof(upb_EnumDef) * n);
   for (int i = 0; i < n; i++) {
-    create_enumdef(ctx, name, protos[i], &e[i]);
+    create_enumdef(ctx, name, protos[i], parent_features, &e[i]);
     e[i].containing_type = containing_type;
   }
   return e;
 
@@ -40,6 +40,7 @@ bool upb_EnumDef_MiniDescriptorEncode(const upb_EnumDef* e, upb_Arena* a,
 
 const char* upb_EnumDef_Name(const upb_EnumDef* e);
 const UPB_DESC(EnumOptions) * upb_EnumDef_Options(const upb_EnumDef* e);
+const UPB_DESC(FeatureSet) * upb_EnumDef_ResolvedFeatures(const upb_EnumDef* e);
 
 upb_StringView upb_EnumDef_ReservedName(const upb_EnumDef* e, int i);
 int upb_EnumDef_ReservedNameCount(const upb_EnumDef* e);