Modified descriptor files.

2 files changed, 182 insertions, 182 deletions

diff --git a/descriptor/descriptor.c b/descriptor/descriptor.c
index 61195b3..c722b25 100644
--- a/descriptor/descriptor.c
+++ b/descriptor/descriptor.c
@@ -181,18 +181,18 @@ static google_protobuf_DescriptorProto *google_protobuf_DescriptorProto_array_el
     &google_protobuf_DescriptorProto_values[16],
     &google_protobuf_DescriptorProto_values[17],
 };
-static UPB_MSG_ARRAY(google_protobuf_DescriptorProto) google_protobuf_DescriptorProto_arrays[3] = {
-  {.elements = &google_protobuf_DescriptorProto_array_elems[0], .len=16},
-  {.elements = &google_protobuf_DescriptorProto_array_elems[16], .len=1},
-  {.elements = &google_protobuf_DescriptorProto_array_elems[17], .len=1},
+static upb_static_array google_protobuf_DescriptorProto_arrays[3] = {
+  UPB_STATIC_ARRAY_INIT(&google_protobuf_DescriptorProto_array_elems[0], 16),
+  UPB_STATIC_ARRAY_INIT(&google_protobuf_DescriptorProto_array_elems[16], 1),
+  UPB_STATIC_ARRAY_INIT(&google_protobuf_DescriptorProto_array_elems[17], 1),
 };
 static google_protobuf_FileDescriptorProto google_protobuf_FileDescriptorProto_values[1];
 
 static google_protobuf_FileDescriptorProto *google_protobuf_FileDescriptorProto_array_elems[] = {
     &google_protobuf_FileDescriptorProto_values[0],
 };
-static UPB_MSG_ARRAY(google_protobuf_FileDescriptorProto) google_protobuf_FileDescriptorProto_arrays[1] = {
-  {.elements = &google_protobuf_FileDescriptorProto_array_elems[0], .len=1},
+static upb_static_array google_protobuf_FileDescriptorProto_arrays[1] = {
+  UPB_STATIC_ARRAY_INIT(&google_protobuf_FileDescriptorProto_array_elems[0], 1),
 };
 static google_protobuf_FileDescriptorSet google_protobuf_FileDescriptorSet_values[1];
 
@@ -207,14 +207,14 @@ static google_protobuf_DescriptorProto_ExtensionRange *google_protobuf_Descripto
     &google_protobuf_DescriptorProto_ExtensionRange_values[5],
     &google_protobuf_DescriptorProto_ExtensionRange_values[6],
 };
-static UPB_MSG_ARRAY(google_protobuf_DescriptorProto_ExtensionRange) google_protobuf_DescriptorProto_ExtensionRange_arrays[7] = {
-  {.elements = &google_protobuf_DescriptorProto_ExtensionRange_array_elems[0], .len=1},
-  {.elements = &google_protobuf_DescriptorProto_ExtensionRange_array_elems[1], .len=1},
-  {.elements = &google_protobuf_DescriptorProto_ExtensionRange_array_elems[2], .len=1},
-  {.elements = &google_protobuf_DescriptorProto_ExtensionRange_array_elems[3], .len=1},
-  {.elements = &google_protobuf_DescriptorProto_ExtensionRange_array_elems[4], .len=1},
-  {.elements = &google_protobuf_DescriptorProto_ExtensionRange_array_elems[5], .len=1},
-  {.elements = &google_protobuf_DescriptorProto_ExtensionRange_array_elems[6], .len=1},
+static upb_static_array google_protobuf_DescriptorProto_ExtensionRange_arrays[7] = {
+  UPB_STATIC_ARRAY_INIT(&google_protobuf_DescriptorProto_ExtensionRange_array_elems[0], 1),
+  UPB_STATIC_ARRAY_INIT(&google_protobuf_DescriptorProto_ExtensionRange_array_elems[1], 1),
+  UPB_STATIC_ARRAY_INIT(&google_protobuf_DescriptorProto_ExtensionRange_array_elems[2], 1),
+  UPB_STATIC_ARRAY_INIT(&google_protobuf_DescriptorProto_ExtensionRange_array_elems[3], 1),
+  UPB_STATIC_ARRAY_INIT(&google_protobuf_DescriptorProto_ExtensionRange_array_elems[4], 1),
+  UPB_STATIC_ARRAY_INIT(&google_protobuf_DescriptorProto_ExtensionRange_array_elems[5], 1),
+  UPB_STATIC_ARRAY_INIT(&google_protobuf_DescriptorProto_ExtensionRange_array_elems[6], 1),
 };
 static google_protobuf_FileOptions google_protobuf_FileOptions_values[1];
 
@@ -226,10 +226,10 @@ static google_protobuf_EnumDescriptorProto *google_protobuf_EnumDescriptorProto_
     &google_protobuf_EnumDescriptorProto_values[2],
     &google_protobuf_EnumDescriptorProto_values[3],
 };
-static UPB_MSG_ARRAY(google_protobuf_EnumDescriptorProto) google_protobuf_EnumDescriptorProto_arrays[3] = {
-  {.elements = &google_protobuf_EnumDescriptorProto_array_elems[0], .len=2},
-  {.elements = &google_protobuf_EnumDescriptorProto_array_elems[2], .len=1},
-  {.elements = &google_protobuf_EnumDescriptorProto_array_elems[3], .len=1},
+static upb_static_array google_protobuf_EnumDescriptorProto_arrays[3] = {
+  UPB_STATIC_ARRAY_INIT(&google_protobuf_EnumDescriptorProto_array_elems[0], 2),
+  UPB_STATIC_ARRAY_INIT(&google_protobuf_EnumDescriptorProto_array_elems[2], 1),
+  UPB_STATIC_ARRAY_INIT(&google_protobuf_EnumDescriptorProto_array_elems[3], 1),
 };
 static google_protobuf_FieldDescriptorProto google_protobuf_FieldDescriptorProto_values[63];
 
@@ -298,25 +298,25 @@ static google_protobuf_FieldDescriptorProto *google_protobuf_FieldDescriptorProt
     &google_protobuf_FieldDescriptorProto_values[61],
     &google_protobuf_FieldDescriptorProto_values[62],
 };
-static UPB_MSG_ARRAY(google_protobuf_FieldDescriptorProto) google_protobuf_FieldDescriptorProto_arrays[18] = {
-  {.elements = &google_protobuf_FieldDescriptorProto_array_elems[0], .len=1},
-  {.elements = &google_protobuf_FieldDescriptorProto_array_elems[1], .len=8},
-  {.elements = &google_protobuf_FieldDescriptorProto_array_elems[9], .len=7},
-  {.elements = &google_protobuf_FieldDescriptorProto_array_elems[16], .len=2},
-  {.elements = &google_protobuf_FieldDescriptorProto_array_elems[18], .len=8},
-  {.elements = &google_protobuf_FieldDescriptorProto_array_elems[26], .len=3},
-  {.elements = &google_protobuf_FieldDescriptorProto_array_elems[29], .len=3},
-  {.elements = &google_protobuf_FieldDescriptorProto_array_elems[32], .len=3},
-  {.elements = &google_protobuf_FieldDescriptorProto_array_elems[35], .len=4},
-  {.elements = &google_protobuf_FieldDescriptorProto_array_elems[39], .len=5},
-  {.elements = &google_protobuf_FieldDescriptorProto_array_elems[44], .len=2},
-  {.elements = &google_protobuf_FieldDescriptorProto_array_elems[46], .len=5},
-  {.elements = &google_protobuf_FieldDescriptorProto_array_elems[51], .len=1},
-  {.elements = &google_protobuf_FieldDescriptorProto_array_elems[52], .len=1},
-  {.elements = &google_protobuf_FieldDescriptorProto_array_elems[53], .len=1},
-  {.elements = &google_protobuf_FieldDescriptorProto_array_elems[54], .len=1},
-  {.elements = &google_protobuf_FieldDescriptorProto_array_elems[55], .len=6},
-  {.elements = &google_protobuf_FieldDescriptorProto_array_elems[61], .len=2},
+static upb_static_array google_protobuf_FieldDescriptorProto_arrays[18] = {
+  UPB_STATIC_ARRAY_INIT(&google_protobuf_FieldDescriptorProto_array_elems[0], 1),
+  UPB_STATIC_ARRAY_INIT(&google_protobuf_FieldDescriptorProto_array_elems[1], 8),
+  UPB_STATIC_ARRAY_INIT(&google_protobuf_FieldDescriptorProto_array_elems[9], 7),
+  UPB_STATIC_ARRAY_INIT(&google_protobuf_FieldDescriptorProto_array_elems[16], 2),
+  UPB_STATIC_ARRAY_INIT(&google_protobuf_FieldDescriptorProto_array_elems[18], 8),
+  UPB_STATIC_ARRAY_INIT(&google_protobuf_FieldDescriptorProto_array_elems[26], 3),
+  UPB_STATIC_ARRAY_INIT(&google_protobuf_FieldDescriptorProto_array_elems[29], 3),
+  UPB_STATIC_ARRAY_INIT(&google_protobuf_FieldDescriptorProto_array_elems[32], 3),
+  UPB_STATIC_ARRAY_INIT(&google_protobuf_FieldDescriptorProto_array_elems[35], 4),
+  UPB_STATIC_ARRAY_INIT(&google_protobuf_FieldDescriptorProto_array_elems[39], 5),
+  UPB_STATIC_ARRAY_INIT(&google_protobuf_FieldDescriptorProto_array_elems[44], 2),
+  UPB_STATIC_ARRAY_INIT(&google_protobuf_FieldDescriptorProto_array_elems[46], 5),
+  UPB_STATIC_ARRAY_INIT(&google_protobuf_FieldDescriptorProto_array_elems[51], 1),
+  UPB_STATIC_ARRAY_INIT(&google_protobuf_FieldDescriptorProto_array_elems[52], 1),
+  UPB_STATIC_ARRAY_INIT(&google_protobuf_FieldDescriptorProto_array_elems[53], 1),
+  UPB_STATIC_ARRAY_INIT(&google_protobuf_FieldDescriptorProto_array_elems[54], 1),
+  UPB_STATIC_ARRAY_INIT(&google_protobuf_FieldDescriptorProto_array_elems[55], 6),
+  UPB_STATIC_ARRAY_INIT(&google_protobuf_FieldDescriptorProto_array_elems[61], 2),
 };
 static google_protobuf_EnumValueDescriptorProto google_protobuf_EnumValueDescriptorProto_values[25];
 
@@ -347,11 +347,11 @@ static google_protobuf_EnumValueDescriptorProto *google_protobuf_EnumValueDescri
     &google_protobuf_EnumValueDescriptorProto_values[23],
     &google_protobuf_EnumValueDescriptorProto_values[24],
 };
-static UPB_MSG_ARRAY(google_protobuf_EnumValueDescriptorProto) google_protobuf_EnumValueDescriptorProto_arrays[4] = {
-  {.elements = &google_protobuf_EnumValueDescriptorProto_array_elems[0], .len=18},
-  {.elements = &google_protobuf_EnumValueDescriptorProto_array_elems[18], .len=3},
-  {.elements = &google_protobuf_EnumValueDescriptorProto_array_elems[21], .len=2},
-  {.elements = &google_protobuf_EnumValueDescriptorProto_array_elems[23], .len=2},
+static upb_static_array google_protobuf_EnumValueDescriptorProto_arrays[4] = {
+  UPB_STATIC_ARRAY_INIT(&google_protobuf_EnumValueDescriptorProto_array_elems[0], 18),
+  UPB_STATIC_ARRAY_INIT(&google_protobuf_EnumValueDescriptorProto_array_elems[18], 3),
+  UPB_STATIC_ARRAY_INIT(&google_protobuf_EnumValueDescriptorProto_array_elems[21], 2),
+  UPB_STATIC_ARRAY_INIT(&google_protobuf_EnumValueDescriptorProto_array_elems[23], 2),
 };
 static google_protobuf_DescriptorProto google_protobuf_DescriptorProto_values[18] = {
 
@@ -366,11 +366,11 @@ static google_protobuf_DescriptorProto google_protobuf_DescriptorProto_values[18
     .options = false,
   }},
     .name = UPB_STATIC_STRING_PTR_INIT(strings[34]),   /* "FileDescriptorSet" */
-    .field = &google_protobuf_FieldDescriptorProto_arrays[0],
-    .nested_type = 0,   /* Not set. */
-    .enum_type = 0,   /* Not set. */
-    .extension_range = 0,   /* Not set. */
-    .extension = 0,   /* Not set. */
+    .field = UPB_STATIC_ARRAY_PTR_TYPED_INIT(google_protobuf_FieldDescriptorProto_arrays[0]),
+    .nested_type = {UPB_ARRAY_NULL_INITIALIZER},   /* Not set. */
+    .enum_type = {UPB_ARRAY_NULL_INITIALIZER},   /* Not set. */
+    .extension_range = {UPB_ARRAY_NULL_INITIALIZER},   /* Not set. */
+    .extension = {UPB_ARRAY_NULL_INITIALIZER},   /* Not set. */
     .options = 0,   /* Not set. */
   },
   {.base = {UPB_DATA_FROZEN},
@@ -384,11 +384,11 @@ static google_protobuf_DescriptorProto google_protobuf_DescriptorProto_values[18
     .options = false,
   }},
     .name = UPB_STATIC_STRING_PTR_INIT(strings[33]),   /* "FileDescriptorProto" */
-    .field = &google_protobuf_FieldDescriptorProto_arrays[1],
-    .nested_type = 0,   /* Not set. */
-    .enum_type = 0,   /* Not set. */
-    .extension_range = 0,   /* Not set. */
-    .extension = 0,   /* Not set. */
+    .field = UPB_STATIC_ARRAY_PTR_TYPED_INIT(google_protobuf_FieldDescriptorProto_arrays[1]),
+    .nested_type = {UPB_ARRAY_NULL_INITIALIZER},   /* Not set. */
+    .enum_type = {UPB_ARRAY_NULL_INITIALIZER},   /* Not set. */
+    .extension_range = {UPB_ARRAY_NULL_INITIALIZER},   /* Not set. */
+    .extension = {UPB_ARRAY_NULL_INITIALIZER},   /* Not set. */
     .options = 0,   /* Not set. */
   },
   {.base = {UPB_DATA_FROZEN},
@@ -402,11 +402,11 @@ static google_protobuf_DescriptorProto google_protobuf_DescriptorProto_values[18
     .options = false,
   }},
     .name = UPB_STATIC_STRING_PTR_INIT(strings[24]),   /* "DescriptorProto" */
-    .field = &google_protobuf_FieldDescriptorProto_arrays[2],
-    .nested_type = &google_protobuf_DescriptorProto_arrays[1],
-    .enum_type = 0,   /* Not set. */
-    .extension_range = 0,   /* Not set. */
-    .extension = 0,   /* Not set. */
+    .field = UPB_STATIC_ARRAY_PTR_TYPED_INIT(google_protobuf_FieldDescriptorProto_arrays[2]),
+    .nested_type = UPB_STATIC_ARRAY_PTR_TYPED_INIT(google_protobuf_DescriptorProto_arrays[1]),
+    .enum_type = {UPB_ARRAY_NULL_INITIALIZER},   /* Not set. */
+    .extension_range = {UPB_ARRAY_NULL_INITIALIZER},   /* Not set. */
+    .extension = {UPB_ARRAY_NULL_INITIALIZER},   /* Not set. */
     .options = 0,   /* Not set. */
   },
   {.base = {UPB_DATA_FROZEN},
@@ -420,11 +420,11 @@ static google_protobuf_DescriptorProto google_protobuf_DescriptorProto_values[18
     .options = false,
   }},
     .name = UPB_STATIC_STRING_PTR_INIT(strings[31]),   /* "FieldDescriptorProto" */
-    .field = &google_protobuf_FieldDescriptorProto_arrays[4],
-    .nested_type = 0,   /* Not set. */
-    .enum_type = &google_protobuf_EnumDescriptorProto_arrays[0],
-    .extension_range = 0,   /* Not set. */
-    .extension = 0,   /* Not set. */
+    .field = UPB_STATIC_ARRAY_PTR_TYPED_INIT(google_protobuf_FieldDescriptorProto_arrays[4]),
+    .nested_type = {UPB_ARRAY_NULL_INITIALIZER},   /* Not set. */
+    .enum_type = UPB_STATIC_ARRAY_PTR_TYPED_INIT(google_protobuf_EnumDescriptorProto_arrays[0]),
+    .extension_range = {UPB_ARRAY_NULL_INITIALIZER},   /* Not set. */
+    .extension = {UPB_ARRAY_NULL_INITIALIZER},   /* Not set. */
     .options = 0,   /* Not set. */
   },
   {.base = {UPB_DATA_FROZEN},
@@ -438,11 +438,11 @@ static google_protobuf_DescriptorProto google_protobuf_DescriptorProto_values[18
     .options = false,
   }},
     .name = UPB_STATIC_STRING_PTR_INIT(strings[26]),   /* "EnumDescriptorProto" */
-    .field = &google_protobuf_FieldDescriptorProto_arrays[5],
-    .nested_type = 0,   /* Not set. */
-    .enum_type = 0,   /* Not set. */
-    .extension_range = 0,   /* Not set. */
-    .extension = 0,   /* Not set. */
+    .field = UPB_STATIC_ARRAY_PTR_TYPED_INIT(google_protobuf_FieldDescriptorProto_arrays[5]),
+    .nested_type = {UPB_ARRAY_NULL_INITIALIZER},   /* Not set. */
+    .enum_type = {UPB_ARRAY_NULL_INITIALIZER},   /* Not set. */
+    .extension_range = {UPB_ARRAY_NULL_INITIALIZER},   /* Not set. */
+    .extension = {UPB_ARRAY_NULL_INITIALIZER},   /* Not set. */
     .options = 0,   /* Not set. */
   },
   {.base = {UPB_DATA_FROZEN},
@@ -456,11 +456,11 @@ static google_protobuf_DescriptorProto google_protobuf_DescriptorProto_values[18
     .options = false,
   }},
     .name = UPB_STATIC_STRING_PTR_INIT(strings[28]),   /* "EnumValueDescriptorProto" */
-    .field = &google_protobuf_FieldDescriptorProto_arrays[6],
-    .nested_type = 0,   /* Not set. */
-    .enum_type = 0,   /* Not set. */
-    .extension_range = 0,   /* Not set. */
-    .extension = 0,   /* Not set. */
+    .field = UPB_STATIC_ARRAY_PTR_TYPED_INIT(google_protobuf_FieldDescriptorProto_arrays[6]),
+    .nested_type = {UPB_ARRAY_NULL_INITIALIZER},   /* Not set. */
+    .enum_type = {UPB_ARRAY_NULL_INITIALIZER},   /* Not set. */
+    .extension_range = {UPB_ARRAY_NULL_INITIALIZER},   /* Not set. */
+    .extension = {UPB_ARRAY_NULL_INITIALIZER},   /* Not set. */
     .options = 0,   /* Not set. */
   },
   {.base = {UPB_DATA_FROZEN},
@@ -474,11 +474,11 @@ static google_protobuf_DescriptorProto google_protobuf_DescriptorProto_values[18
     .options = false,
   }},
     .name = UPB_STATIC_STRING_PTR_INIT(strings[47]),   /* "ServiceDescriptorProto" */
-    .field = &google_protobuf_FieldDescriptorProto_arrays[7],
-    .nested_type = 0,   /* Not set. */
-    .enum_type = 0,   /* Not set. */
-    .extension_range = 0,   /* Not set. */
-    .extension = 0,   /* Not set. */
+    .field = UPB_STATIC_ARRAY_PTR_TYPED_INIT(google_protobuf_FieldDescriptorProto_arrays[7]),
+    .nested_type = {UPB_ARRAY_NULL_INITIALIZER},   /* Not set. */
+    .enum_type = {UPB_ARRAY_NULL_INITIALIZER},   /* Not set. */
+    .extension_range = {UPB_ARRAY_NULL_INITIALIZER},   /* Not set. */
+    .extension = {UPB_ARRAY_NULL_INITIALIZER},   /* Not set. */
     .options = 0,   /* Not set. */
   },
   {.base = {UPB_DATA_FROZEN},
@@ -492,11 +492,11 @@ static google_protobuf_DescriptorProto google_protobuf_DescriptorProto_values[18
     .options = false,
   }},
     .name = UPB_STATIC_STRING_PTR_INIT(strings[41]),   /* "MethodDescriptorProto" */
-    .field = &google_protobuf_FieldDescriptorProto_arrays[8],
-    .nested_type = 0,   /* Not set. */
-    .enum_type = 0,   /* Not set. */
-    .extension_range = 0,   /* Not set. */
-    .extension = 0,   /* Not set. */
+    .field = UPB_STATIC_ARRAY_PTR_TYPED_INIT(google_protobuf_FieldDescriptorProto_arrays[8]),
+    .nested_type = {UPB_ARRAY_NULL_INITIALIZER},   /* Not set. */
+    .enum_type = {UPB_ARRAY_NULL_INITIALIZER},   /* Not set. */
+    .extension_range = {UPB_ARRAY_NULL_INITIALIZER},   /* Not set. */
+    .extension = {UPB_ARRAY_NULL_INITIALIZER},   /* Not set. */
     .options = 0,   /* Not set. */
   },
   {.base = {UPB_DATA_FROZEN},
@@ -510,11 +510,11 @@ static google_protobuf_DescriptorProto google_protobuf_DescriptorProto_values[18
     .options = false,
   }},
     .name = UPB_STATIC_STRING_PTR_INIT(strings[35]),   /* "FileOptions" */
-    .field = &google_protobuf_FieldDescriptorProto_arrays[9],
-    .nested_type = 0,   /* Not set. */
-    .enum_type = &google_protobuf_EnumDescriptorProto_arrays[1],
-    .extension_range = &google_protobuf_DescriptorProto_ExtensionRange_arrays[0],
-    .extension = 0,   /* Not set. */
+    .field = UPB_STATIC_ARRAY_PTR_TYPED_INIT(google_protobuf_FieldDescriptorProto_arrays[9]),
+    .nested_type = {UPB_ARRAY_NULL_INITIALIZER},   /* Not set. */
+    .enum_type = UPB_STATIC_ARRAY_PTR_TYPED_INIT(google_protobuf_EnumDescriptorProto_arrays[1]),
+    .extension_range = UPB_STATIC_ARRAY_PTR_TYPED_INIT(google_protobuf_DescriptorProto_ExtensionRange_arrays[0]),
+    .extension = {UPB_ARRAY_NULL_INITIALIZER},   /* Not set. */
     .options = 0,   /* Not set. */
   },
   {.base = {UPB_DATA_FROZEN},
@@ -528,11 +528,11 @@ static google_protobuf_DescriptorProto google_protobuf_DescriptorProto_values[18
     .options = false,
   }},
     .name = UPB_STATIC_STRING_PTR_INIT(strings[40]),   /* "MessageOptions" */
-    .field = &google_protobuf_FieldDescriptorProto_arrays[10],
-    .nested_type = 0,   /* Not set. */
-    .enum_type = 0,   /* Not set. */
-    .extension_range = &google_protobuf_DescriptorProto_ExtensionRange_arrays[1],
-    .extension = 0,   /* Not set. */
+    .field = UPB_STATIC_ARRAY_PTR_TYPED_INIT(google_protobuf_FieldDescriptorProto_arrays[10]),
+    .nested_type = {UPB_ARRAY_NULL_INITIALIZER},   /* Not set. */
+    .enum_type = {UPB_ARRAY_NULL_INITIALIZER},   /* Not set. */
+    .extension_range = UPB_STATIC_ARRAY_PTR_TYPED_INIT(google_protobuf_DescriptorProto_ExtensionRange_arrays[1]),
+    .extension = {UPB_ARRAY_NULL_INITIALIZER},   /* Not set. */
     .options = 0,   /* Not set. */
   },
   {.base = {UPB_DATA_FROZEN},
@@ -546,11 +546,11 @@ static google_protobuf_DescriptorProto google_protobuf_DescriptorProto_values[18
     .options = false,
   }},
     .name = UPB_STATIC_STRING_PTR_INIT(strings[32]),   /* "FieldOptions" */
-    .field = &google_protobuf_FieldDescriptorProto_arrays[11],
-    .nested_type = 0,   /* Not set. */
-    .enum_type = &google_protobuf_EnumDescriptorProto_arrays[2],
-    .extension_range = &google_protobuf_DescriptorProto_ExtensionRange_arrays[2],
-    .extension = 0,   /* Not set. */
+    .field = UPB_STATIC_ARRAY_PTR_TYPED_INIT(google_protobuf_FieldDescriptorProto_arrays[11]),
+    .nested_type = {UPB_ARRAY_NULL_INITIALIZER},   /* Not set. */
+    .enum_type = UPB_STATIC_ARRAY_PTR_TYPED_INIT(google_protobuf_EnumDescriptorProto_arrays[2]),
+    .extension_range = UPB_STATIC_ARRAY_PTR_TYPED_INIT(google_protobuf_DescriptorProto_ExtensionRange_arrays[2]),
+    .extension = {UPB_ARRAY_NULL_INITIALIZER},   /* Not set. */
     .options = 0,   /* Not set. */
   },
   {.base = {UPB_DATA_FROZEN},
@@ -564,11 +564,11 @@ static google_protobuf_DescriptorProto google_protobuf_DescriptorProto_values[18
     .options = false,
   }},
     .name = UPB_STATIC_STRING_PTR_INIT(strings[27]),   /* "EnumOptions" */
-    .field = &google_protobuf_FieldDescriptorProto_arrays[12],
-    .nested_type = 0,   /* Not set. */
-    .enum_type = 0,   /* Not set. */
-    .extension_range = &google_protobuf_DescriptorProto_ExtensionRange_arrays[3],
-    .extension = 0,   /* Not set. */
+    .field = UPB_STATIC_ARRAY_PTR_TYPED_INIT(google_protobuf_FieldDescriptorProto_arrays[12]),
+    .nested_type = {UPB_ARRAY_NULL_INITIALIZER},   /* Not set. */
+    .enum_type = {UPB_ARRAY_NULL_INITIALIZER},   /* Not set. */
+    .extension_range = UPB_STATIC_ARRAY_PTR_TYPED_INIT(google_protobuf_DescriptorProto_ExtensionRange_arrays[3]),
+    .extension = {UPB_ARRAY_NULL_INITIALIZER},   /* Not set. */
     .options = 0,   /* Not set. */
   },
   {.base = {UPB_DATA_FROZEN},
@@ -582,11 +582,11 @@ static google_protobuf_DescriptorProto google_protobuf_DescriptorProto_values[18
     .options = false,
   }},
     .name = UPB_STATIC_STRING_PTR_INIT(strings[29]),   /* "EnumValueOptions" */
-    .field = &google_protobuf_FieldDescriptorProto_arrays[13],
-    .nested_type = 0,   /* Not set. */
-    .enum_type = 0,   /* Not set. */
-    .extension_range = &google_protobuf_DescriptorProto_ExtensionRange_arrays[4],
-    .extension = 0,   /* Not set. */
+    .field = UPB_STATIC_ARRAY_PTR_TYPED_INIT(google_protobuf_FieldDescriptorProto_arrays[13]),
+    .nested_type = {UPB_ARRAY_NULL_INITIALIZER},   /* Not set. */
+    .enum_type = {UPB_ARRAY_NULL_INITIALIZER},   /* Not set. */
+    .extension_range = UPB_STATIC_ARRAY_PTR_TYPED_INIT(google_protobuf_DescriptorProto_ExtensionRange_arrays[4]),
+    .extension = {UPB_ARRAY_NULL_INITIALIZER},   /* Not set. */
     .options = 0,   /* Not set. */
   },
   {.base = {UPB_DATA_FROZEN},
@@ -600,11 +600,11 @@ static google_protobuf_DescriptorProto google_protobuf_DescriptorProto_values[18
     .options = false,
   }},
     .name = UPB_STATIC_STRING_PTR_INIT(strings[48]),   /* "ServiceOptions" */
-    .field = &google_protobuf_FieldDescriptorProto_arrays[14],
-    .nested_type = 0,   /* Not set. */
-    .enum_type = 0,   /* Not set. */
-    .extension_range = &google_protobuf_DescriptorProto_ExtensionRange_arrays[5],
-    .extension = 0,   /* Not set. */
+    .field = UPB_STATIC_ARRAY_PTR_TYPED_INIT(google_protobuf_FieldDescriptorProto_arrays[14]),
+    .nested_type = {UPB_ARRAY_NULL_INITIALIZER},   /* Not set. */
+    .enum_type = {UPB_ARRAY_NULL_INITIALIZER},   /* Not set. */
+    .extension_range = UPB_STATIC_ARRAY_PTR_TYPED_INIT(google_protobuf_DescriptorProto_ExtensionRange_arrays[5]),
+    .extension = {UPB_ARRAY_NULL_INITIALIZER},   /* Not set. */
     .options = 0,   /* Not set. */
   },
   {.base = {UPB_DATA_FROZEN},
@@ -618,11 +618,11 @@ static google_protobuf_DescriptorProto google_protobuf_DescriptorProto_values[18
     .options = false,
   }},
     .name = UPB_STATIC_STRING_PTR_INIT(strings[42]),   /* "MethodOptions" */
-    .field = &google_protobuf_FieldDescriptorProto_arrays[15],
-    .nested_type = 0,   /* Not set. */
-    .enum_type = 0,   /* Not set. */
-    .extension_range = &google_protobuf_DescriptorProto_ExtensionRange_arrays[6],
-    .extension = 0,   /* Not set. */
+    .field = UPB_STATIC_ARRAY_PTR_TYPED_INIT(google_protobuf_FieldDescriptorProto_arrays[15]),
+    .nested_type = {UPB_ARRAY_NULL_INITIALIZER},   /* Not set. */
+    .enum_type = {UPB_ARRAY_NULL_INITIALIZER},   /* Not set. */
+    .extension_range = UPB_STATIC_ARRAY_PTR_TYPED_INIT(google_protobuf_DescriptorProto_ExtensionRange_arrays[6]),
+    .extension = {UPB_ARRAY_NULL_INITIALIZER},   /* Not set. */
     .options = 0,   /* Not set. */
   },
   {.base = {UPB_DATA_FROZEN},
@@ -636,11 +636,11 @@ static google_protobuf_DescriptorProto google_protobuf_DescriptorProto_values[18
     .options = false,
   }},
     .name = UPB_STATIC_STRING_PTR_INIT(strings[68]),   /* "UninterpretedOption" */
-    .field = &google_protobuf_FieldDescriptorProto_arrays[16],
-    .nested_type = &google_protobuf_DescriptorProto_arrays[2],
-    .enum_type = 0,   /* Not set. */
-    .extension_range = 0,   /* Not set. */
-    .extension = 0,   /* Not set. */
+    .field = UPB_STATIC_ARRAY_PTR_TYPED_INIT(google_protobuf_FieldDescriptorProto_arrays[16]),
+    .nested_type = UPB_STATIC_ARRAY_PTR_TYPED_INIT(google_protobuf_DescriptorProto_arrays[2]),
+    .enum_type = {UPB_ARRAY_NULL_INITIALIZER},   /* Not set. */
+    .extension_range = {UPB_ARRAY_NULL_INITIALIZER},   /* Not set. */
+    .extension = {UPB_ARRAY_NULL_INITIALIZER},   /* Not set. */
     .options = 0,   /* Not set. */
   },
   {.base = {UPB_DATA_FROZEN},
@@ -654,11 +654,11 @@ static google_protobuf_DescriptorProto google_protobuf_DescriptorProto_values[18
     .options = false,
   }},
     .name = UPB_STATIC_STRING_PTR_INIT(strings[30]),   /* "ExtensionRange" */
-    .field = &google_protobuf_FieldDescriptorProto_arrays[3],
-    .nested_type = 0,   /* Not set. */
-    .enum_type = 0,   /* Not set. */
-    .extension_range = 0,   /* Not set. */
-    .extension = 0,   /* Not set. */
+    .field = UPB_STATIC_ARRAY_PTR_TYPED_INIT(google_protobuf_FieldDescriptorProto_arrays[3]),
+    .nested_type = {UPB_ARRAY_NULL_INITIALIZER},   /* Not set. */
+    .enum_type = {UPB_ARRAY_NULL_INITIALIZER},   /* Not set. */
+    .extension_range = {UPB_ARRAY_NULL_INITIALIZER},   /* Not set. */
+    .extension = {UPB_ARRAY_NULL_INITIALIZER},   /* Not set. */
     .options = 0,   /* Not set. */
   },
   {.base = {UPB_DATA_FROZEN},
@@ -672,11 +672,11 @@ static google_protobuf_DescriptorProto google_protobuf_DescriptorProto_values[18
     .options = false,
   }},
     .name = UPB_STATIC_STRING_PTR_INIT(strings[43]),   /* "NamePart" */
-    .field = &google_protobuf_FieldDescriptorProto_arrays[17],
-    .nested_type = 0,   /* Not set. */
-    .enum_type = 0,   /* Not set. */
-    .extension_range = 0,   /* Not set. */
-    .extension = 0,   /* Not set. */
+    .field = UPB_STATIC_ARRAY_PTR_TYPED_INIT(google_protobuf_FieldDescriptorProto_arrays[17]),
+    .nested_type = {UPB_ARRAY_NULL_INITIALIZER},   /* Not set. */
+    .enum_type = {UPB_ARRAY_NULL_INITIALIZER},   /* Not set. */
+    .extension_range = {UPB_ARRAY_NULL_INITIALIZER},   /* Not set. */
+    .extension = {UPB_ARRAY_NULL_INITIALIZER},   /* Not set. */
     .options = 0,   /* Not set. */
   },
 };
@@ -695,11 +695,11 @@ static google_protobuf_FileDescriptorProto google_protobuf_FileDescriptorProto_v
   }},
     .name = UPB_STATIC_STRING_PTR_INIT(strings[74]),   /* "descriptor/descriptor.proto" */
     .package = UPB_STATIC_STRING_PTR_INIT(strings[85]),   /* "google.protobuf" */
-    .dependency = 0,   /* Not set. */
-    .message_type = &google_protobuf_DescriptorProto_arrays[0],
-    .enum_type = 0,   /* Not set. */
-    .service = 0,   /* Not set. */
-    .extension = 0,   /* Not set. */
+    .dependency = UPB_ARRAY_NULL_INITIALIZER,   /* Not set. */
+    .message_type = UPB_STATIC_ARRAY_PTR_TYPED_INIT(google_protobuf_DescriptorProto_arrays[0]),
+    .enum_type = {UPB_ARRAY_NULL_INITIALIZER},   /* Not set. */
+    .service = {UPB_ARRAY_NULL_INITIALIZER},   /* Not set. */
+    .extension = {UPB_ARRAY_NULL_INITIALIZER},   /* Not set. */
     .options = &google_protobuf_FileOptions_values[0],
   },
 };
@@ -709,7 +709,7 @@ static google_protobuf_FileDescriptorSet google_protobuf_FileDescriptorSet_value
    .set_flags = {.has = {
     .file = true,
   }},
-    .file = &google_protobuf_FileDescriptorProto_arrays[0],
+    .file = UPB_STATIC_ARRAY_PTR_TYPED_INIT(google_protobuf_FileDescriptorProto_arrays[0]),
   },
 };
 static google_protobuf_DescriptorProto_ExtensionRange google_protobuf_DescriptorProto_ExtensionRange_values[7] = {
@@ -785,7 +785,7 @@ static google_protobuf_FileOptions google_protobuf_FileOptions_values[1] = {
     .java_outer_classname = UPB_STATIC_STRING_PTR_INIT(strings[25]),   /* "DescriptorProtos" */
     .optimize_for = 1,
     .java_multiple_files = 0,   /* Not set. */
-    .uninterpreted_option = 0,   /* Not set. */
+    .uninterpreted_option = {UPB_ARRAY_NULL_INITIALIZER},   /* Not set. */
   },
 };
 static google_protobuf_EnumDescriptorProto google_protobuf_EnumDescriptorProto_values[4] = {
@@ -797,7 +797,7 @@ static google_protobuf_EnumDescriptorProto google_protobuf_EnumDescriptorProto_v
     .options = false,
   }},
     .name = UPB_STATIC_STRING_PTR_INIT(strings[67]),   /* "Type" */
-    .value = &google_protobuf_EnumValueDescriptorProto_arrays[0],
+    .value = UPB_STATIC_ARRAY_PTR_TYPED_INIT(google_protobuf_EnumValueDescriptorProto_arrays[0]),
     .options = 0,   /* Not set. */
   },
   {.base = {UPB_DATA_FROZEN},
@@ -807,7 +807,7 @@ static google_protobuf_EnumDescriptorProto google_protobuf_EnumDescriptorProto_v
     .options = false,
   }},
     .name = UPB_STATIC_STRING_PTR_INIT(strings[39]),   /* "Label" */
-    .value = &google_protobuf_EnumValueDescriptorProto_arrays[1],
+    .value = UPB_STATIC_ARRAY_PTR_TYPED_INIT(google_protobuf_EnumValueDescriptorProto_arrays[1]),
     .options = 0,   /* Not set. */
   },
   {.base = {UPB_DATA_FROZEN},
@@ -817,7 +817,7 @@ static google_protobuf_EnumDescriptorProto google_protobuf_EnumDescriptorProto_v
     .options = false,
   }},
     .name = UPB_STATIC_STRING_PTR_INIT(strings[44]),   /* "OptimizeMode" */
-    .value = &google_protobuf_EnumValueDescriptorProto_arrays[2],
+    .value = UPB_STATIC_ARRAY_PTR_TYPED_INIT(google_protobuf_EnumValueDescriptorProto_arrays[2]),
     .options = 0,   /* Not set. */
   },
   {.base = {UPB_DATA_FROZEN},
@@ -827,7 +827,7 @@ static google_protobuf_EnumDescriptorProto google_protobuf_EnumDescriptorProto_v
     .options = false,
   }},
     .name = UPB_STATIC_STRING_PTR_INIT(strings[23]),   /* "CType" */
-    .value = &google_protobuf_EnumValueDescriptorProto_arrays[3],
+    .value = UPB_STATIC_ARRAY_PTR_TYPED_INIT(google_protobuf_EnumValueDescriptorProto_arrays[3]),
     .options = 0,   /* Not set. */
   },
 };
diff --git a/descriptor/descriptor.h b/descriptor/descriptor.h
index 8db5bd3..8c59624 100644
--- a/descriptor/descriptor.h
+++ b/descriptor/descriptor.h
@@ -18,74 +18,92 @@ extern struct google_protobuf_FileDescriptorSet *upb_file_descriptor_set;
 struct google_protobuf_UninterpretedOption_NamePart;
 typedef struct google_protobuf_UninterpretedOption_NamePart
     google_protobuf_UninterpretedOption_NamePart;
+UPB_DEFINE_MSG_ARRAY(google_protobuf_UninterpretedOption_NamePart)
 
 struct google_protobuf_DescriptorProto;
 typedef struct google_protobuf_DescriptorProto
     google_protobuf_DescriptorProto;
+UPB_DEFINE_MSG_ARRAY(google_protobuf_DescriptorProto)
 
 struct google_protobuf_EnumDescriptorProto;
 typedef struct google_protobuf_EnumDescriptorProto
     google_protobuf_EnumDescriptorProto;
+UPB_DEFINE_MSG_ARRAY(google_protobuf_EnumDescriptorProto)
 
 struct google_protobuf_UninterpretedOption;
 typedef struct google_protobuf_UninterpretedOption
     google_protobuf_UninterpretedOption;
+UPB_DEFINE_MSG_ARRAY(google_protobuf_UninterpretedOption)
 
 struct google_protobuf_FileDescriptorProto;
 typedef struct google_protobuf_FileDescriptorProto
     google_protobuf_FileDescriptorProto;
+UPB_DEFINE_MSG_ARRAY(google_protobuf_FileDescriptorProto)
 
 struct google_protobuf_MethodDescriptorProto;
 typedef struct google_protobuf_MethodDescriptorProto
     google_protobuf_MethodDescriptorProto;
+UPB_DEFINE_MSG_ARRAY(google_protobuf_MethodDescriptorProto)
 
 struct google_protobuf_EnumValueOptions;
 typedef struct google_protobuf_EnumValueOptions
     google_protobuf_EnumValueOptions;
+UPB_DEFINE_MSG_ARRAY(google_protobuf_EnumValueOptions)
 
 struct google_protobuf_EnumValueDescriptorProto;
 typedef struct google_protobuf_EnumValueDescriptorProto
     google_protobuf_EnumValueDescriptorProto;
+UPB_DEFINE_MSG_ARRAY(google_protobuf_EnumValueDescriptorProto)
 
 struct google_protobuf_ServiceDescriptorProto;
 typedef struct google_protobuf_ServiceDescriptorProto
     google_protobuf_ServiceDescriptorProto;
+UPB_DEFINE_MSG_ARRAY(google_protobuf_ServiceDescriptorProto)
 
 struct google_protobuf_FileDescriptorSet;
 typedef struct google_protobuf_FileDescriptorSet
     google_protobuf_FileDescriptorSet;
+UPB_DEFINE_MSG_ARRAY(google_protobuf_FileDescriptorSet)
 
 struct google_protobuf_DescriptorProto_ExtensionRange;
 typedef struct google_protobuf_DescriptorProto_ExtensionRange
     google_protobuf_DescriptorProto_ExtensionRange;
+UPB_DEFINE_MSG_ARRAY(google_protobuf_DescriptorProto_ExtensionRange)
 
 struct google_protobuf_FieldOptions;
 typedef struct google_protobuf_FieldOptions
     google_protobuf_FieldOptions;
+UPB_DEFINE_MSG_ARRAY(google_protobuf_FieldOptions)
 
 struct google_protobuf_FileOptions;
 typedef struct google_protobuf_FileOptions
     google_protobuf_FileOptions;
+UPB_DEFINE_MSG_ARRAY(google_protobuf_FileOptions)
 
 struct google_protobuf_MessageOptions;
 typedef struct google_protobuf_MessageOptions
     google_protobuf_MessageOptions;
+UPB_DEFINE_MSG_ARRAY(google_protobuf_MessageOptions)
 
 struct google_protobuf_EnumOptions;
 typedef struct google_protobuf_EnumOptions
     google_protobuf_EnumOptions;
+UPB_DEFINE_MSG_ARRAY(google_protobuf_EnumOptions)
 
 struct google_protobuf_FieldDescriptorProto;
 typedef struct google_protobuf_FieldDescriptorProto
     google_protobuf_FieldDescriptorProto;
+UPB_DEFINE_MSG_ARRAY(google_protobuf_FieldDescriptorProto)
 
 struct google_protobuf_ServiceOptions;
 typedef struct google_protobuf_ServiceOptions
     google_protobuf_ServiceOptions;
+UPB_DEFINE_MSG_ARRAY(google_protobuf_ServiceOptions)
 
 struct google_protobuf_MethodOptions;
 typedef struct google_protobuf_MethodOptions
     google_protobuf_MethodOptions;
+UPB_DEFINE_MSG_ARRAY(google_protobuf_MethodOptions)
 
 /* The message definitions themselves. */
 
@@ -101,7 +119,6 @@ struct google_protobuf_UninterpretedOption_NamePart {
   upb_strptr name_part;
   bool is_extension;
 };
-UPB_DEFINE_MSG_ARRAY(google_protobuf_UninterpretedOption_NamePart)
 
 struct google_protobuf_DescriptorProto {
   upb_data base;
@@ -118,14 +135,13 @@ struct google_protobuf_DescriptorProto {
     } has;
   } set_flags;
   upb_strptr name;
-  UPB_MSG_ARRAY(google_protobuf_FieldDescriptorProto)* field;
-  UPB_MSG_ARRAY(google_protobuf_DescriptorProto)* nested_type;
-  UPB_MSG_ARRAY(google_protobuf_EnumDescriptorProto)* enum_type;
-  UPB_MSG_ARRAY(google_protobuf_DescriptorProto_ExtensionRange)* extension_range;
-  UPB_MSG_ARRAY(google_protobuf_FieldDescriptorProto)* extension;
+  UPB_MSG_ARRAYPTR(google_protobuf_FieldDescriptorProto) field;
+  UPB_MSG_ARRAYPTR(google_protobuf_DescriptorProto) nested_type;
+  UPB_MSG_ARRAYPTR(google_protobuf_EnumDescriptorProto) enum_type;
+  UPB_MSG_ARRAYPTR(google_protobuf_DescriptorProto_ExtensionRange) extension_range;
+  UPB_MSG_ARRAYPTR(google_protobuf_FieldDescriptorProto) extension;
   google_protobuf_MessageOptions* options;
 };
-UPB_DEFINE_MSG_ARRAY(google_protobuf_DescriptorProto)
 
 struct google_protobuf_EnumDescriptorProto {
   upb_data base;
@@ -138,10 +154,9 @@ struct google_protobuf_EnumDescriptorProto {
     } has;
   } set_flags;
   upb_strptr name;
-  UPB_MSG_ARRAY(google_protobuf_EnumValueDescriptorProto)* value;
+  UPB_MSG_ARRAYPTR(google_protobuf_EnumValueDescriptorProto) value;
   google_protobuf_EnumOptions* options;
 };
-UPB_DEFINE_MSG_ARRAY(google_protobuf_EnumDescriptorProto)
 
 struct google_protobuf_UninterpretedOption {
   upb_data base;
@@ -156,14 +171,13 @@ struct google_protobuf_UninterpretedOption {
       bool string_value:1;  /* = 7, optional. */
     } has;
   } set_flags;
-  UPB_MSG_ARRAY(google_protobuf_UninterpretedOption_NamePart)* name;
+  UPB_MSG_ARRAYPTR(google_protobuf_UninterpretedOption_NamePart) name;
   upb_strptr identifier_value;
   uint64_t positive_int_value;
   int64_t negative_int_value;
   double double_value;
   upb_strptr string_value;
 };
-UPB_DEFINE_MSG_ARRAY(google_protobuf_UninterpretedOption)
 
 struct google_protobuf_FileDescriptorProto {
   upb_data base;
@@ -182,14 +196,13 @@ struct google_protobuf_FileDescriptorProto {
   } set_flags;
   upb_strptr name;
   upb_strptr package;
-  upb_array* dependency;
-  UPB_MSG_ARRAY(google_protobuf_DescriptorProto)* message_type;
-  UPB_MSG_ARRAY(google_protobuf_EnumDescriptorProto)* enum_type;
-  UPB_MSG_ARRAY(google_protobuf_ServiceDescriptorProto)* service;
-  UPB_MSG_ARRAY(google_protobuf_FieldDescriptorProto)* extension;
+  upb_arrayptr dependency;
+  UPB_MSG_ARRAYPTR(google_protobuf_DescriptorProto) message_type;
+  UPB_MSG_ARRAYPTR(google_protobuf_EnumDescriptorProto) enum_type;
+  UPB_MSG_ARRAYPTR(google_protobuf_ServiceDescriptorProto) service;
+  UPB_MSG_ARRAYPTR(google_protobuf_FieldDescriptorProto) extension;
   google_protobuf_FileOptions* options;
 };
-UPB_DEFINE_MSG_ARRAY(google_protobuf_FileDescriptorProto)
 
 struct google_protobuf_MethodDescriptorProto {
   upb_data base;
@@ -207,7 +220,6 @@ struct google_protobuf_MethodDescriptorProto {
   upb_strptr output_type;
   google_protobuf_MethodOptions* options;
 };
-UPB_DEFINE_MSG_ARRAY(google_protobuf_MethodDescriptorProto)
 
 struct google_protobuf_EnumValueOptions {
   upb_data base;
@@ -217,9 +229,8 @@ struct google_protobuf_EnumValueOptions {
       bool uninterpreted_option:1;  /* = 999, repeated. */
     } has;
   } set_flags;
-  UPB_MSG_ARRAY(google_protobuf_UninterpretedOption)* uninterpreted_option;
+  UPB_MSG_ARRAYPTR(google_protobuf_UninterpretedOption) uninterpreted_option;
 };
-UPB_DEFINE_MSG_ARRAY(google_protobuf_EnumValueOptions)
 
 struct google_protobuf_EnumValueDescriptorProto {
   upb_data base;
@@ -235,7 +246,6 @@ struct google_protobuf_EnumValueDescriptorProto {
   int32_t number;
   google_protobuf_EnumValueOptions* options;
 };
-UPB_DEFINE_MSG_ARRAY(google_protobuf_EnumValueDescriptorProto)
 
 struct google_protobuf_ServiceDescriptorProto {
   upb_data base;
@@ -248,10 +258,9 @@ struct google_protobuf_ServiceDescriptorProto {
     } has;
   } set_flags;
   upb_strptr name;
-  UPB_MSG_ARRAY(google_protobuf_MethodDescriptorProto)* method;
+  UPB_MSG_ARRAYPTR(google_protobuf_MethodDescriptorProto) method;
   google_protobuf_ServiceOptions* options;
 };
-UPB_DEFINE_MSG_ARRAY(google_protobuf_ServiceDescriptorProto)
 
 struct google_protobuf_FileDescriptorSet {
   upb_data base;
@@ -261,9 +270,8 @@ struct google_protobuf_FileDescriptorSet {
       bool file:1;  /* = 1, repeated. */
     } has;
   } set_flags;
-  UPB_MSG_ARRAY(google_protobuf_FileDescriptorProto)* file;
+  UPB_MSG_ARRAYPTR(google_protobuf_FileDescriptorProto) file;
 };
-UPB_DEFINE_MSG_ARRAY(google_protobuf_FileDescriptorSet)
 
 struct google_protobuf_DescriptorProto_ExtensionRange {
   upb_data base;
@@ -277,7 +285,6 @@ struct google_protobuf_DescriptorProto_ExtensionRange {
   int32_t start;
   int32_t end;
 };
-UPB_DEFINE_MSG_ARRAY(google_protobuf_DescriptorProto_ExtensionRange)
 
 struct google_protobuf_FieldOptions {
   upb_data base;
@@ -295,9 +302,8 @@ struct google_protobuf_FieldOptions {
   bool packed;
   bool deprecated;
   upb_strptr experimental_map_key;
-  UPB_MSG_ARRAY(google_protobuf_UninterpretedOption)* uninterpreted_option;
+  UPB_MSG_ARRAYPTR(google_protobuf_UninterpretedOption) uninterpreted_option;
 };
-UPB_DEFINE_MSG_ARRAY(google_protobuf_FieldOptions)
 
 struct google_protobuf_FileOptions {
   upb_data base;
@@ -315,9 +321,8 @@ struct google_protobuf_FileOptions {
   upb_strptr java_outer_classname;
   int32_t optimize_for;
   bool java_multiple_files;
-  UPB_MSG_ARRAY(google_protobuf_UninterpretedOption)* uninterpreted_option;
+  UPB_MSG_ARRAYPTR(google_protobuf_UninterpretedOption) uninterpreted_option;
 };
-UPB_DEFINE_MSG_ARRAY(google_protobuf_FileOptions)
 
 struct google_protobuf_MessageOptions {
   upb_data base;
@@ -329,9 +334,8 @@ struct google_protobuf_MessageOptions {
     } has;
   } set_flags;
   bool message_set_wire_format;
-  UPB_MSG_ARRAY(google_protobuf_UninterpretedOption)* uninterpreted_option;
+  UPB_MSG_ARRAYPTR(google_protobuf_UninterpretedOption) uninterpreted_option;
 };
-UPB_DEFINE_MSG_ARRAY(google_protobuf_MessageOptions)
 
 struct google_protobuf_EnumOptions {
   upb_data base;
@@ -341,9 +345,8 @@ struct google_protobuf_EnumOptions {
       bool uninterpreted_option:1;  /* = 999, repeated. */
     } has;
   } set_flags;
-  UPB_MSG_ARRAY(google_protobuf_UninterpretedOption)* uninterpreted_option;
+  UPB_MSG_ARRAYPTR(google_protobuf_UninterpretedOption) uninterpreted_option;
 };
-UPB_DEFINE_MSG_ARRAY(google_protobuf_EnumOptions)
 
 struct google_protobuf_FieldDescriptorProto {
   upb_data base;
@@ -369,7 +372,6 @@ struct google_protobuf_FieldDescriptorProto {
   upb_strptr default_value;
   google_protobuf_FieldOptions* options;
 };
-UPB_DEFINE_MSG_ARRAY(google_protobuf_FieldDescriptorProto)
 
 struct google_protobuf_ServiceOptions {
   upb_data base;
@@ -379,9 +381,8 @@ struct google_protobuf_ServiceOptions {
       bool uninterpreted_option:1;  /* = 999, repeated. */
     } has;
   } set_flags;
-  UPB_MSG_ARRAY(google_protobuf_UninterpretedOption)* uninterpreted_option;
+  UPB_MSG_ARRAYPTR(google_protobuf_UninterpretedOption) uninterpreted_option;
 };
-UPB_DEFINE_MSG_ARRAY(google_protobuf_ServiceOptions)
 
 struct google_protobuf_MethodOptions {
   upb_data base;
@@ -391,9 +392,8 @@ struct google_protobuf_MethodOptions {
       bool uninterpreted_option:1;  /* = 999, repeated. */
     } has;
   } set_flags;
-  UPB_MSG_ARRAY(google_protobuf_UninterpretedOption)* uninterpreted_option;
+  UPB_MSG_ARRAYPTR(google_protobuf_UninterpretedOption) uninterpreted_option;
 };
-UPB_DEFINE_MSG_ARRAY(google_protobuf_MethodOptions)
 
 #ifdef __cplusplus
 }  /* extern "C" */