Add option_dependency support to UPB's FileDef

PiperOrigin-RevId: 902855746

Author: runzw

upb/reflection/file_def.c

@@ -38,6 +38,7 @@ struct upb_FileDef {
   const upb_FileDef** deps;
   const int32_t* public_deps;
   const int32_t* weak_deps;
+  const upb_StringView* option_deps;
   const upb_MessageDef* top_lvl_msgs;
   const upb_EnumDef* top_lvl_enums;
   const upb_FieldDef* top_lvl_exts;
@@ -48,6 +49,7 @@ struct upb_FileDef {
   int dep_count;
   int public_dep_count;
   int weak_dep_count;
+  int option_dep_count;
   int top_lvl_msg_count;
   int top_lvl_enum_count;
   int top_lvl_ext_count;
@@ -105,6 +107,10 @@ int upb_FileDef_WeakDependencyCount(const upb_FileDef* f) {
   return f->weak_dep_count;
 }
 
+int upb_FileDef_OptionDependencyCount(const upb_FileDef* f) {
+  return f->option_dep_count;
+}
+
 const int32_t* _upb_FileDef_PublicDependencyIndexes(const upb_FileDef* f) {
   return f->public_deps;
 }
@@ -142,10 +148,15 @@ const upb_FileDef* upb_FileDef_PublicDependency(const upb_FileDef* f, int i) {
 }
 
 const upb_FileDef* upb_FileDef_WeakDependency(const upb_FileDef* f, int i) {
-  UPB_ASSERT(0 <= i && i < f->public_dep_count);
+  UPB_ASSERT(0 <= i && i < f->weak_dep_count);
   return f->deps[f->weak_deps[i]];
 }
 
+upb_StringView upb_FileDef_OptionDependency(const upb_FileDef* f, int i) {
+  UPB_ASSERT(0 <= i && i < f->option_dep_count);
+  return f->option_deps[i];
+}
+
 const upb_MessageDef* upb_FileDef_TopLevelMessage(const upb_FileDef* f, int i) {
   UPB_ASSERT(0 <= i && i < f->top_lvl_msg_count);
   return _upb_MessageDef_At(f->top_lvl_msgs, i);
@@ -406,6 +417,17 @@ void _upb_FileDef_Create(upb_DefBuilder* ctx,
     mutable_weak_deps[i] = weak_deps[i];
   }
 
+  const upb_StringView* option_deps =
+      google_protobuf_FileDescriptorProto_option_dependency(file_proto, &n);
+  file->option_dep_count = n;
+  file->option_deps = UPB_DEFBUILDER_ALLOCARRAY(ctx, upb_StringView, n);
+  upb_StringView* mutable_option_deps = (upb_StringView*)file->option_deps;
+  for (size_t i = 0; i < n; i++) {
+    char* dup = _strviewdup(ctx, option_deps[i]);
+    mutable_option_deps[i].data = dup;
+    mutable_option_deps[i].size = option_deps[i].size;
+  }
+
   // Create enums.
   enums = google_protobuf_FileDescriptorProto_enum_type(file_proto, &n);
   file->top_lvl_enum_count = n;

upb/reflection/file_def.h

@@ -10,6 +10,7 @@
 #ifndef UPB_REFLECTION_FILE_DEF_H_
 #define UPB_REFLECTION_FILE_DEF_H_
 
+#include "upb/base/string_view.h"
 #include "upb/reflection/common.h"
 #include "upb/reflection/descriptor_bootstrap.h"
 
@@ -50,6 +51,9 @@ int upb_FileDef_TopLevelMessageCount(const upb_FileDef* f);
 const upb_FileDef* upb_FileDef_WeakDependency(const upb_FileDef* f, int i);
 int upb_FileDef_WeakDependencyCount(const upb_FileDef* f);
 
+upb_StringView upb_FileDef_OptionDependency(const upb_FileDef* f, int i);
+int upb_FileDef_OptionDependencyCount(const upb_FileDef* f);
+
 // Returns whether |symbol| is transitively included by |f|
 bool upb_FileDef_Resolves(const upb_FileDef* f, const char* symbol);
 

upb/util/def_to_proto.c

@@ -591,6 +591,13 @@ static google_protobuf_FileDescriptorProto* filedef_toproto(upb_ToProto_Context*
   const int32_t* weak_dep_nums = _upb_FileDef_WeakDependencyIndexes(f);
   if (n) memcpy(weak_deps, weak_dep_nums, n * sizeof(int32_t));
 
+  n = upb_FileDef_OptionDependencyCount(f);
+  upb_StringView* option_deps =
+      google_protobuf_FileDescriptorProto_resize_option_dependency(proto, n, ctx->arena);
+  for (size_t i = 0; i < n; i++) {
+    option_deps[i] = strviewdup2(ctx, upb_FileDef_OptionDependency(f, i));
+  }
+
   n = upb_FileDef_TopLevelMessageCount(f);
   google_protobuf_DescriptorProto** msgs =
       google_protobuf_FileDescriptorProto_resize_message_type(proto, n, ctx->arena);