diff --git a/generated_for_cmake/google/protobuf/descriptor.upb.c b/generated_for_cmake/google/protobuf/descriptor.upb.c
index e5d8f76d18..0b0a748406 100644
--- a/generated_for_cmake/google/protobuf/descriptor.upb.c
+++ b/generated_for_cmake/google/protobuf/descriptor.upb.c
@@ -93,7 +93,7 @@ const upb_msglayout google_protobuf_FileDescriptorProto_msginit = {
     {&upb_prm_1bt_max128b, UPB_SIZE(11258999068426274, 22517998136852514)},
     {&upb_prm_1bt_max128b, UPB_SIZE(12384898975334442, 24769797950603306)},
     {&upb_prm_1bt_max64b, UPB_SIZE(13510798882373682, 27021597764485170)},
-    {&upb_prm_1bt_max192b, UPB_SIZE(14636698789085242, 29273397578039354)},
+    {&upb_prm_1bt_max128b, UPB_SIZE(14636698789085242, 29273397578039354)},
     {&upb_psm_1bt_max256b, UPB_SIZE(7881385247440962, 15762684595339330)},
     {&upb_psm_1bt_max64b, UPB_SIZE(9007289449381962, 18014488704122954)},
     {&fastdecode_generic, UPB_SIZE(0, 0)},
@@ -151,11 +151,11 @@ const upb_msglayout google_protobuf_DescriptorProto_msginit = {
   {
     {&fastdecode_generic, UPB_SIZE(0, 0)},
     {&upb_pss_1bt, UPB_SIZE(1125899906973706, 2251799813816330)},
-    {&upb_prm_1bt_max192b, UPB_SIZE(4503599627632658, 9007199255003154)},
+    {&upb_prm_1bt_max128b, UPB_SIZE(4503599627632658, 9007199255003154)},
     {&upb_prm_1bt_max128b, UPB_SIZE(5629499534213146, 11258999068426266)},
     {&upb_prm_1bt_max128b, UPB_SIZE(6755399441252386, 13510798882308130)},
     {&upb_prm_1bt_max64b, UPB_SIZE(7881299347963946, 15762598695862314)},
-    {&upb_prm_1bt_max192b, UPB_SIZE(9007199255003186, 18014398509744178)},
+    {&upb_prm_1bt_max128b, UPB_SIZE(9007199255003186, 18014398509744178)},
     {&upb_psm_1bt_max64b, UPB_SIZE(3377777030266938, 6755476750794810)},
     {&upb_prm_1bt_max64b, UPB_SIZE(10133099161976898, 20266198323560514)},
     {&upb_prm_1bt_max64b, UPB_SIZE(11258999068557386, 22517998136983626)},
@@ -351,23 +351,23 @@ static const upb_msglayout_field google_protobuf_FieldDescriptorProto__fields[11
 const upb_msglayout google_protobuf_FieldDescriptorProto_msginit = {
   {
     {&fastdecode_generic, UPB_SIZE(0, 0)},
-    {&upb_pss_1bt, UPB_SIZE(10133099165777930, 11258999072620554)},
-    {&upb_pss_1bt, UPB_SIZE(12384898983657490, 15762598704185362)},
-    {&upb_psv4_1bt, UPB_SIZE(6755399441580056, 6755399441580056)},
-    {&upb_psv4_1bt, UPB_SIZE(2251799813816352, 2251799813816352)},
-    {&upb_psv4_1bt, UPB_SIZE(4503599627632680, 4503599627632680)},
-    {&upb_pss_1bt, UPB_SIZE(14636698805731378, 20266198339944498)},
-    {&upb_pss_1bt, UPB_SIZE(16888498636193850, 24769797984092218)},
-    {&upb_psm_1bt_max64b, UPB_SIZE(21392214194126914, 33777113169395778)},
-    {&upb_psv4_1bt, UPB_SIZE(7881299348947016, 7881299348947016)},
-    {&upb_pss_1bt, UPB_SIZE(19140298483433554, 29273397645017170)},
+    {&upb_pss_1bt, UPB_SIZE(6755399445250058, 6755399445250058)},
+    {&upb_pss_1bt, UPB_SIZE(9007199263129618, 11258999076814866)},
+    {&upb_psv4_1bt, UPB_SIZE(3377699721052184, 3377699721052184)},
+    {&upb_psv4_1bt, UPB_SIZE(1125899906973728, 1125899906973728)},
+    {&upb_psv4_1bt, UPB_SIZE(2251799813947432, 2251799813947432)},
+    {&upb_pss_1bt, UPB_SIZE(11258999085203506, 15762598712574002)},
+    {&upb_pss_1bt, UPB_SIZE(13510798915665978, 20266198356721722)},
+    {&upb_psm_1bt_max64b, UPB_SIZE(18014514473599042, 29273513542025282)},
+    {&upb_psv4_1bt, UPB_SIZE(4503599628419144, 4503599628419144)},
+    {&upb_pss_1bt, UPB_SIZE(15762598762905682, 24769798017646674)},
     {&fastdecode_generic, UPB_SIZE(0, 0)},
     {&fastdecode_generic, UPB_SIZE(0, 0)},
     {&fastdecode_generic, UPB_SIZE(0, 0)},
     {&fastdecode_generic, UPB_SIZE(0, 0)},
     {&fastdecode_generic, UPB_SIZE(0, 0)},
     {&fastdecode_generic, UPB_SIZE(0, 0)},
-    {&upb_psb1_2bt, UPB_SIZE(9007199256838536, 9007199256838536)},
+    {&upb_psb1_2bt, UPB_SIZE(5629499536310664, 5629499536310664)},
     {&fastdecode_generic, UPB_SIZE(0, 0)},
     {&fastdecode_generic, UPB_SIZE(0, 0)},
     {&fastdecode_generic, UPB_SIZE(0, 0)},
@@ -721,37 +721,37 @@ static const upb_msglayout_field google_protobuf_FileOptions__fields[21] = {
 const upb_msglayout google_protobuf_FileOptions_msginit = {
   {
     {&fastdecode_generic, UPB_SIZE(0, 0)},
-    {&upb_pss_1bt, UPB_SIZE(7881299482116106, 9007199388958730)},
+    {&upb_pss_1bt, UPB_SIZE(5629499668430858, 6755399575273482)},
     {&fastdecode_generic, UPB_SIZE(0, 0)},
     {&fastdecode_generic, UPB_SIZE(0, 0)},
     {&fastdecode_generic, UPB_SIZE(0, 0)},
     {&fastdecode_generic, UPB_SIZE(0, 0)},
     {&fastdecode_generic, UPB_SIZE(0, 0)},
     {&fastdecode_generic, UPB_SIZE(0, 0)},
-    {&upb_pss_1bt, UPB_SIZE(10133099430019138, 13510799150547010)},
-    {&upb_psv4_1bt, UPB_SIZE(2251799813816392, 2251799813816392)},
-    {&upb_psb1_1bt, UPB_SIZE(4503599627632720, 4503599627632720)},
-    {&upb_pss_1bt, UPB_SIZE(12384899512139866, 18014399046352986)},
+    {&upb_pss_1bt, UPB_SIZE(7881299616333890, 11258999336861762)},
+    {&upb_psv4_1bt, UPB_SIZE(1125899906973768, 1125899906973768)},
+    {&upb_psb1_1bt, UPB_SIZE(2251799813947472, 2251799813947472)},
+    {&upb_pss_1bt, UPB_SIZE(10133099698454618, 15762599232667738)},
     {&fastdecode_generic, UPB_SIZE(0, 0)},
     {&fastdecode_generic, UPB_SIZE(0, 0)},
     {&fastdecode_generic, UPB_SIZE(0, 0)},
     {&fastdecode_generic, UPB_SIZE(0, 0)},
-    {&upb_psb1_2bt, UPB_SIZE(4785074604605824, 4785074604605824)},
-    {&upb_psb1_2bt, UPB_SIZE(5066549581840776, 5066549581840776)},
-    {&upb_psb1_2bt, UPB_SIZE(5348024559600016, 5348024559600016)},
+    {&upb_psb1_2bt, UPB_SIZE(2533274790920576, 2533274790920576)},
+    {&upb_psb1_2bt, UPB_SIZE(2814749768155528, 2814749768155528)},
+    {&upb_psb1_2bt, UPB_SIZE(3096224745914768, 3096224745914768)},
     {&fastdecode_generic, UPB_SIZE(0, 0)},
-    {&upb_psb1_2bt, UPB_SIZE(5629499538407840, 5629499538407840)},
+    {&upb_psb1_2bt, UPB_SIZE(3377699724722592, 3377699724722592)},
     {&fastdecode_generic, UPB_SIZE(0, 0)},
     {&fastdecode_generic, UPB_SIZE(0, 0)},
-    {&upb_psb1_2bt, UPB_SIZE(5910974519312824, 5910974519312824)},
+    {&upb_psb1_2bt, UPB_SIZE(3659174705627576, 3659174705627576)},
     {&fastdecode_generic, UPB_SIZE(0, 0)},
     {&fastdecode_generic, UPB_SIZE(0, 0)},
     {&fastdecode_generic, UPB_SIZE(0, 0)},
-    {&upb_psb1_2bt, UPB_SIZE(6192449504412120, 6192449504412120)},
+    {&upb_psb1_2bt, UPB_SIZE(3940649690726872, 3940649690726872)},
     {&fastdecode_generic, UPB_SIZE(0, 0)},
     {&fastdecode_generic, UPB_SIZE(0, 0)},
     {&fastdecode_generic, UPB_SIZE(0, 0)},
-    {&upb_psb1_2bt, UPB_SIZE(6473924497900024, 6473924497900024)},
+    {&upb_psb1_2bt, UPB_SIZE(4222124684214776, 4222124684214776)},
   },
   &google_protobuf_FileOptions_submsgs[0],
   &google_protobuf_FileOptions__fields[0],
@@ -827,16 +827,16 @@ static const upb_msglayout_field google_protobuf_FieldOptions__fields[7] = {
 const upb_msglayout google_protobuf_FieldOptions_msginit = {
   {
     {&fastdecode_generic, UPB_SIZE(0, 0)},
-    {&upb_psv4_1bt, UPB_SIZE(2251799813816328, 2251799813816328)},
-    {&upb_psb1_1bt, UPB_SIZE(6755399441580048, 6755399441580048)},
-    {&upb_psb1_1bt, UPB_SIZE(7036874418815000, 7036874418815000)},
+    {&upb_psv4_1bt, UPB_SIZE(1125899906973704, 1125899906973704)},
+    {&upb_psb1_1bt, UPB_SIZE(3377699721052176, 3377699721052176)},
+    {&upb_psb1_1bt, UPB_SIZE(3659174698287128, 3659174698287128)},
     {&fastdecode_generic, UPB_SIZE(0, 0)},
-    {&upb_psb1_1bt, UPB_SIZE(7318349396574248, 7318349396574248)},
-    {&upb_psv4_1bt, UPB_SIZE(4503599627632688, 4503599627632688)},
+    {&upb_psb1_1bt, UPB_SIZE(3940649676046376, 3940649676046376)},
+    {&upb_psv4_1bt, UPB_SIZE(2251799813947440, 2251799813947440)},
     {&fastdecode_generic, UPB_SIZE(0, 0)},
     {&fastdecode_generic, UPB_SIZE(0, 0)},
     {&fastdecode_generic, UPB_SIZE(0, 0)},
-    {&upb_psb1_1bt, UPB_SIZE(7599824375382096, 7599824375382096)},
+    {&upb_psb1_1bt, UPB_SIZE(4222124654854224, 4222124654854224)},
     {&fastdecode_generic, UPB_SIZE(0, 0)},
     {&fastdecode_generic, UPB_SIZE(0, 0)},
     {&fastdecode_generic, UPB_SIZE(0, 0)},
@@ -861,7 +861,7 @@ const upb_msglayout google_protobuf_FieldOptions_msginit = {
   },
   &google_protobuf_FieldOptions_submsgs[0],
   &google_protobuf_FieldOptions__fields[0],
-  UPB_SIZE(20, 24), 7, false,
+  UPB_SIZE(24, 24), 7, false,
 };
 
 static const upb_msglayout *const google_protobuf_OneofOptions_submsgs[1] = {