From 2322a8720f2350c04045fd2066288bb327bd992f Mon Sep 17 00:00:00 2001 From: Protobuf Team Bot Date: Wed, 10 Apr 2024 17:23:17 +0000 Subject: [PATCH] Auto-generate files after cl/623529512 --- csharp/src/Google.Protobuf.Test/testprotos.pb | Bin 451597 -> 451808 bytes .../Reflection/Descriptor.pb.cs | 26 ++++++----- php/ext/google/protobuf/php-upb.c | 41 +++++++++--------- php/ext/google/protobuf/php-upb.h | 1 + ruby/ext/google/protobuf_c/ruby-upb.c | 3 +- ruby/ext/google/protobuf_c/ruby-upb.h | 1 + upb/cmake/google/protobuf/descriptor.upb.h | 1 + .../protobuf/descriptor.upb_minitable.c | 3 +- .../cmake/google/protobuf/descriptor.upb.h | 1 + .../protobuf/descriptor.upb_minitable.c | 3 +- 10 files changed, 47 insertions(+), 33 deletions(-) diff --git a/csharp/src/Google.Protobuf.Test/testprotos.pb b/csharp/src/Google.Protobuf.Test/testprotos.pb index 9ecd4afc689f671adbcac42ba600223c3e162879..0f39b3822d7ff1d6a9366d621cc36e0220489120 100644 GIT binary patch delta 20791 zcmZ8}37D0|m3CKs>;3NS?dxuqX1g?-0s^8jAaoP~5lu7(&D2sx)u_~>AkeT_PEWX506`6x}VK9-N05wZfDjm_VeC-di4Cag2`UG zRcH1jD_Q!M6?mc3I_H}h3tr9-SR%Aqzj|Tcoo>3WE9+vh-$WhCS!HS=3v4Hcv(UPO z*DsyHl0A}RMh%fj353~#mGM-hm1;=4IedZ_^9FIE0SY|j2mCpAqWzI zL$(Ry3N+#{wWwY&i3`Jl?ppO$Ib(NI8}8y-jnfCH#f6p?T77wa#b80PZ${CAVqYk} zA{}9e*1b{UHny&>4YhlDo+@NR?cTx?#pi_9eY~Ff%oj>0L=$8iUAZKgyI|0HSy4TD7vEud%bxaY7g;T zRdXC_4;7RKodOP@Ils-B#G(dwu#S1Z^&16U1KVaiC$xq{1MXnmx(wl>TS*2d4v7~M z2_aAp3581up~HqWEDhR<()ctq+I|OX-(_f~G(+j3nbH&@Lqp*Tlx8SBv~iQ*W>Ff} zRYdK3vRk@TWJ+_CuE><8$f*b$D@!;^S2Rlo_lwd1k3}!`Wc|84mMLwa^kZ=mX{e3D z>9Io5DTJs%t2V(OMQKFSh^SRB_McrwWJ=p8Jt9+@qHIKAQq^sv^oSO%f?GssC_WJ# z>czUGp2(DT5K&LWMXaDU3cV*9wNa%VlzyUZI|>1OgW@QDgZkvcl2I8Fm%hcD>Te(! z)$BTrKr*UbdqslC9L+nV)He?-qcbcXSVqU2>u+EgU3R@jU>V*12E~G~9m6}QPd-S- zWJr9FjEOhX-#{`ZsY!g0j3JWyM1v61V|fdu83W7M3`-0wW8*q{DBj1`*UgK8Wo+}Z z;3A?JZb7_19Sy#dec$!zOz{B4pN{MBp+WF;X>hMi(?Qx6V2+wR&{+Q zQ#_82dL|Q1G&r6K8>r%O6n~~slc0mBJQ3OxSv2x4)~Zjg2>XOh5-=&~5{!o$GJ-{= z8d?OKGz+fBNaLY9h2^Y>_TR;>OHE-u&2F~MG1Tm-j5iWRfWQwZ`2ih*FqNtU1picq zQKumIr!ovX$%K#3G2T{vWMBf+ObnJj$Ix+9G{tF>22Qrp+Ms%lT}M4hM)A_m_scv6i1sA9RH5ujidD{5c_sHuuIYMfz$!tD9? zu%@Zm*+iHQ?b+Ex)E~1M)-_!fCPfI)xp~SY^vMg%?wC;^e?VZ2qkegT<(3%@aK6A= zv=xFBH4AekBp4miqcCEg>1GFnfZC&&xd1WBqzf^10ha1+#@q#%>1OE8XS}1*#q32; zGhzC&=ci1>U}?qYWLvEbs`iISepk6xLqA(&mcE1JeT5vQ@B_ z20zX8?q3*R%B<2qv*^!1XDbW;!h-s$YiO0T7gHxUxEp_?p2fzS5WqQ$O%FkUx)z(R zh5)rKHeHQ%EVP%Ps~e>7C+L=B(@}>n$)=+YUt&63tb!0^MzbHV`zgGI~D+=59MFq9Jn=a_{7 z%UU8*I954#70daUF{}@kO`~)b^P2=T&0FNf)ht?afZhEF0PI|?>i~qEtM#Y^M9I~x z*-gSuK-96C-O^QzO3T8aT*LTVYES}0dkqUpf_pFm0I8;R(O37eU-Vt4T`R zAwa=(tf--gdm%tY>lk(ze^g9R*vRa%(h*UQ`&miU{U#?7E&U~Xpf{v)Kv6O3vyCjb zD8oa2wviP#F#-^8WXa~iUzuXYD1ANZc0c>uJ+Eg|VFP2oo=ru;@;WP)69-jBL-Tct zruQ`!1b=6Cv(kUCsJtI*65aVLwyrlM#z1Urppsjdv4^_m?<_1e0zuNGX)s;0qJ#b! zb?L`u_WWly6?QrHKeMT@(Saa~3Q+(7s9ItLfyD@_>d5QQT6eByxp}(A81>r!6~HAz zu#tk%qK4N*5BF!UK2&1@g_frph8+P-Hqap@R=-R`R9(Yb$vFXEF*a&go8Dq-Bv?rJ zx?VxKr~vitWYNa?tV?f8tQtE_Jv2w|WbqP3OvdbF_2jAnWz@5iHE$8zPDC~WayR4q zqHhMU+X{CxuR+k0df66{xF_oN0P8()53}=S+ewV7_pq=?8U_LA_cB`r5Me1$-XZ}? z>}7>vfYpbbgOPTS@ef(I(r2P`16Z@@@&jzd2#Dm!hXNXKki{FT22h6|WKHC(jIU_G zL7J7N8!b5ML+0M9A*R+3Sz#mPH;erCA#2h#7)YZU0dSZ_x4+LGxXE%b)DE*;Illm* z7C^ZT0ff_X=pJP`??w;&nsx4Ul=+RtXtv3D#~A+~HJX9Jag2HKpdWk) zNTd0)=#5{q0sTMIJ``e*f2Ms%0+c(UeJHRLNFNFTN}M1c{$4QypNfY38~a25Q_MDc zw5vHqdbFZaK{)FRW*3X@6Bx`8$o>=pl=y;d(aab;UlViR==TFzr_|Tk^w{CqUuV<9 zq2DmOBtuUtCGR{aDyrvgmztY^&!@=tS-AHIIG%qtf(Ytq4eUReJT3IZ&<6;rEESN zR_#l~r#lT>^2^yiO2B*wjQI(axXeQ1)!fj&k{v*~C;@?SQ7%ecVFfBM$g6pw{UfvM zXPlUaA`r-lmLek$MSf((^)hDVhxXO%68R_rfhm!X5?8528`a=~(7uL-l+{lT7*{ba zIdJ%61BX18tQZxI8O%z`@X0i(0A;UHlXO`O+5%GND}?!RR75#*S~ z-HDu6a=Ft5hW^HO5d{ShKFdpVQ^huC zGD;}t0D}?&Q-UV7$y8z&Ejm;Q1kXh;Jj~utJ(sO0Z8Sw+>}pS@#8ogI4ba#yPZhFW{j(RH6(x z7VxIcf@cH;bQeXhJi;cFFER`cNeu(dRf{-Qf9WFH?Jwe3`{zh2VDhr`$VXWbD_>?f zTyQKi95j0^<7!7~a~B-Tcv*{Jvh)UKu9eZ&3O2QTrJ?XZvC=q{X0w&NPCPB6W5ZmlB zETvB9?%+AQq6;Hg^VANGrId_xXk6^nAqWH`0i}_E;NPj63kd$5dRzd4f2ST74#nqt zy177L0@O^j2YXL9w-r7MZPi{tP`yX(Z39!?(A~pxzKULdg0)WV;Yb{ksVAu z;nbyBW=t6@S8mM&f7*E%L(=Za0a3H-^=}i`)Pt_wC{<9C3uJG=dPI)+1b{ z5rhEs9^opDKmsTnjYf@OO?w{AW}>O=Xf_jh;wV>n1W^!7N6D=()0lB-5;_^}8N=3g zKWUsmbI?hyc9qZp$w}TsW^Dke4DZk}7%3RgnlGdD@7SpFFAW3DKwp}^r5Wf;J@#EO z1AR%cb0cEM3*FN^=R!1eEVfXmxi80}M?O2FV+RP;0LpFx1pgV$4+#D$H#7H$w|kOP8aqJ?EeT7%Y3vT(&BKT?+iYHR2qKglpreUq%PiB<;FBn$Zf zFx?Mkz{wVuNmd|G0ct85bdxQW#KBikO|}}!E&&u}TeJ*%i*}*twCLHVSf7E@3J!|`@VdWHUUDIuu1zH5GHK0LODGH!h}s0rsoSZJqOeqThd)7uyL$>i{YT&-(onZ z_qSM~%qE}=IJQ{GGOx4*2fDvH{pCdV5*t`;IH=#NwJQP<<<(Y!9O{7JsJ2?mX#x=8HJ#8Y4w!WuLgn2OYv@z2oN-|Tr10T;=T=yO2jsdkhXn%Z0)suoXv_U>&705{n z5EY%Vu4}7&=?kuQ-8Do-XRKSgsfw_DK5P6=+h;&s5ha+x@mb z8?Q4q(QdrX!d*B`kthP2>MUH?DF~D5tmKUv!lXK@U8f)=_>r)<9F3@A69-*3{J2`Q zFB^W`Edr_;IpDZl1jK!@QFtis& z8~(($bzf*GLQpI;6d@=U8mEMySV&HxEOo$(aH5VTu3%mJ;BO3^MTVyclguJpC8_Zh zJd13Vqy_}fBI5Z^!BZUCOKpB@>8OaUWIu^2BG#)11iD$p;96>{d(nUwgKMd+ZeRex zwbaH9%rr*B4E8U#v6=c~wC_RIBWkyR^-L|dRT?-DX<$H^1_s1{TW%u_OqW75L|5A4 zRSjB4V|}Ha8L715WV6c_u68XNf**#g>6)Y#2BX^0AH?6w_+p;mAV2Uc`hsx`|KUIf%@xGSNIhEId1c& zrE}cmgO68?e;hB<@PFw+OIU%`4PRt*#yRbJjvFt~uIIR2Ag`S9RnXwtt|bDD+WA?u zav5vg{xj1+Dv=Fghk(sgi4)PKWvqFJ6Q%@hd$J))2zZ3HPI21ppG)`o8#~4ZoildQ z*6EzFlQ_=V1#;p>8Q6Kw?kcw*fatArcK7?l?u?-LTz;<@_;Kp^Z)xD)R{pK2fc7Zg z>LCvuRPe1H@_=CYmWDjtxW?(gRcDJE*E;}Uah)NeyY@Og-tiSgb$Yx5f~bzhJKgxu zT6M`5H$Ks^mCU*Ok{;@DG1LL&PzQvUF40h@5t|6zAMKo_t{kzn0{v+F#lZ{Yzyxgo zCpqa3tJqwYn&haSh8T8Da#YS05TzzLDpLvwyCyj}#Zhzt!h@5XMsoKHh5f!K$NPiV*#2iKMJEu{=Y zW~C>rW(!!qS&r>zG-)R~%fU#Ziw7zST;-_i9Dz|10(m(j1VRIQ(hsC3@O?r0-`B7M ztbBoS1kEf995r<%#8GsCQy^2ufN;bDa>R=?|0Sr>73u$4#}@I_3d2DWu)Ktb579X8n5MB5^aYCOWo(wJTebtw*k0ldT85p7cth9vfM` z=IgVSsmbd}d0`+tfX39MpWetCIfH792WaA`FY3P4pGT}iXA2iBSj=xkkUDxeWx>!<}FAx3r5kr-|Tz@eoY}2b}tHrcH1c{0E#;xncr>|A5n~txT#U zC}a*rhqthWgAbVs=)7{sR6ysILr#H?Iy$c$a&YF69-{NgA*W2Pm>?uZ=Z4O~JHkWs zIPR#!Ka2MLH`|sv>Ui?9DS;~#gx@j8mJb>PMl}$~TU8-Iyc~1z;#Q7RF&K_#m!OD- zz?7hHJf2+w_*2K0&qWgSIF1GsB=TmMDxskKlmd#@!UQeHCmr?D4hR7RDAzPVbjL|Y zy=emk*GZ?54i#DqPC9L_57yCnGJ!yHzjku|)-BORGgha=k#qq8iDj1Nu z?TCTzvfEDm41sAoU88@O-F9qXE;@Fjj5}%j1%Z6>N1Z6{&S~;Tl%)`6DDZ>B<)sD? zdzaetz;fQ9 z6a6(O?}mKKHsP}_oVuT`y`e+Hc3O0~njP#l4Fcs{h*8rtH{(hO zP}elKq>a%)ZPQ$wVCdlqF+pKQRP;9cL$4XxOq9l-k|Z20=DX_gXoAxdYe3z<39!v~GyO~3&H1i+h6-gc&3AL#cMx0S z1a87`E?<0r-O~eqgJ_{4$_3FvSDl3M6+{bNbrJ>y(Lz`4j48>oD5~Dh9=tI@PoWmM z>I@8oVt{gE3$_ocT*jVj$yH`x_ z1jXm>zYt-PCoUi|VFHLS*=A~@;k!+T3BIDHZ8}TwMAShh40-w9Em*)WdFbdBy{TsfXS6H;S>GPyKyFPKx*&J$A&@LY;j?_Y%IM zmLs~C0I8(zB}&*H7rhiMtz}N%DO!&Y(P6uQ+;bs4`~&te8+gHR(8#`^ zod_k;()|qxjtj0z_XEO-7hIL@2ZR$ZxJdWYgjhfW^ddR&{%#iyKW#NHYWG10{1>(R z0KtDzyN{C9Kgb|2pdkN2yAKG(0Hyl?QPmIHeTAWW#m#xqlgSp!N?&pPlHee})RYK_LQ_07p8>+EDV}OIAX+`eQ>_L>tEYHq^?8cTLQ1ww z_xSUXbBLYmIo(rd63D6U8J;?m2#jhVkQ-njKs#o5*!;J|et`r~m>K=_Fl${l(^HS4 zg&2A>y?XV7pDI1zSyAdR>zbP7si&o+M_n+>6YqDa?bw1J-z=EHk}nM^YCu#Jz9T4 zIw8E|@ipn+9c6d3)Jt9J7=l0Tf>L>=t6fD=;`AP@E~!0O`xr4*EfqP!VNt$CMF(^komzDD5IcGIOoR zE;?(Lau}#ioPmqAnFhEU3iLgzc%B$ils5W_p@;(qyl*JPyX%vdS>ZyltXr+Xji85ZV8lz~z ze$`8Q&=yC~x+-yfh3s-M9m4D#~qbHb&8jeY01nyN0san<*HiQRtc1JoUIJ z6zOb0&2$r`v0gJ)(NX?2FO+E|XoKoC53h?prsysT-D)pqQ96Et9cHO&XO zw>)0s$&4{DSl;qH`9vI$V&`p7WjX|g0tE8-F9hh%w>@?ICjk_;dFpw$z)~Osm<0F{ z7^&nJh?pk{@H^Q>hywysL~3M}KnUY2*CL+O`UYiFG4fi?H=Fb z*@$brbcO)^0*Uk{Abh>uQ!kDHLATvgKN|x?b=y50@bWPz0P$pPyVrgXyhfvz1h_)o z;i)VE;Uf5LXU1;nKxOy;5ugq4dv;INSD4oKdHg`8 zuV~`l=Xv?cjp9&UYq~}ro*|I=pd!jxgRs_1se}+oK=Fa664wGtflT%b0g8O!sboJ1 zfcJaq1-`&20fD?o5CWlriv;O;Sbfmrp9s&B^O%hU5+vI5v>F}M^AA3Q?jTK&H2(m? z^9N}}NY7(60$bT98PAJfIDKe5&xGecl8z=nLjcA@*@6^#{xJEK=1WqcyWfvJyN7Z# zN6yvbpJg0PUOMV|^!pw3wo1Kv_I0v6VJIBaleSQR4~}`5U33X39M@h;kp{IB674n! zP~^BL+$Jjl{?rT#m3lRULZx2iFrpBL)h9guRmRb@8bhG{Osnw;kKQ$=glDNyC%ooe zl%r`bJ>hlht{jbRGuX<%$~c-+h@Ui$=EBjRn-GTpjHisFxrp#DOh7{bjW4}aCZdtz z{l??xGLEKE{Eg?8D7T61?rG0XDo4xgE(9`DSfsMMr#+lvrK3f5_l$NlDUhEb(0-=u zF5>TuaWt~I$i$j4AhWv==rI6+&=6yQ91W|_d;I&1qiNlNKs%atE9X6xmVq`5IPa;n z44@UJfbjxbMl^0u0)d`^ zAwY>Mat5Y=M$991i49AT5>}D`l|Uk|&4h+f5x>YHN5kxE9-rjXq)n3nEz1ySN7Fg_ zny0Q4@D*&=yhie-1`q*#&BN1d>1TRoe9h}L$+v=(Xaa7Z>9<0eMgx!2D0aJMoz)( zN}tcp_?7l35NN;BjeDi9_U%RD#=X+7CpQ*=@N1=yjfM0p?%zPxdNzC@-Rh8Ar~8?; z&=GE(ktIk8zs@v%g$mj*D_cO0e%`n5QxWZmh_3SOJH*S5B4m?Z@VR_|QA960Uhw02 zvJ*r)DI0=XKuSXuVb3%#`rr&}-hQ61P69>ZV2}+_LcpXd@uw(xmX)>tlPN*7N;X6Z z0h_84^P^E`S+f0nQ-V4r8={1O*Q*i>qW?aNe}-X!DM1rQHbe;lTc{E*Muq2CtM)JY zx$>^E2>5=Q868fR{8wZbo>JA$SPL(xYwZ0#|Mh|mvmnXjM#!eZsmjk z(e;wAQv5;y8(#9&ZHW*d!d~(*)!eH%p|B=e@-6#iuQl0Bv~yVF=gMO>6{KES<2Pt8 zf<_3yw8rn)Dfp#gLi^T7H+{!`)oXn=6RnNwvze&3*82@wXP9VtT<_y4^h1gXcvH0F zJ2p7ADVvEV|4rFU)Qg+^2671_o5aDx$J=w-;}?^^Hv9ZW(H}tY7N8u7fMDC~s~__K zf@`ziQvS;afUse+pNHm6qKrf_8U04I`68QK{)XWoFTLTbe~1M-q~sUL;|U-*-tciY zn<^>bpsmr9b?mvHZ8a3+o~?$0>e*^2$TeGu;xI$dl!Wd!Kj)pO+xP5H!8RZHtVxA1 zu7nzTKHc&MHrXG1UQhr!jeFB2|yk9J@$^k)ro+5!Jt`Z8n3qIc#lhZ9Qv@iHL zk5Bi|E5KAql)=r}w(yE=0E?Ck2u?X$D16KR(0>KI*; z&Zg>CBvf?}RLAV=OXnq$eTU)I7;eP-jec_MBNaVIr*}KNz)j(^9B5>)$cx8R?m-A( zMRlxLUN#81i){_?6w&v(9Q+|!%1iAx3W1Yyx)oy(`w+^DZwE~@bBel zQgFN-vpZ)FF>3tqVZ-rLDZC%VKTbC?T9?ne z_QGfBSt6i7+^;<=1cIPgK3ot27_mQwhYNI_N&?jQQPj48|DpFs*-R8nA7wX(CV`J) z>UVjfAecUiAyf3R_6!6^qAv^hkv>PVsVIhyWK&TL9f_$Q<`ET5kw;?KuZ)mJQI_J< z7=Bup2>I}$Ph+vd;7*K6sN&=g|DTAS3;A8GPsH3HC=6oy1DbLoh67dij4mqrJo-N5 zKWqJY%#CH~(q8rR81__MGP;m_5e+Qjw?6(w%#CO1l8e5G;q@m4IGKxh{wk(2b^=R* u=?2=Ueih4==Ww9`L%xb36-ogv1ZeSB)2C?d!eoZ@S8eXVFKq5=vEkwGzzfPfGgBv zY1KZw^HPsnSM<2)&#Gsr-}zJf5uy6%I5jhiPgVolzkRYAqtbVm1!+=>2Go4i{+F+) zsYUg}Y}imWwRXHt!>C59QZRhM?cY@DEG2*H#O^Rr+x>7y7ng$bbgL_hQ9Q4r7^8SzMKLJ_=j*;sF+uTseYi&` zp5L>NV=R<{3o42Q6u*5zMYDkB1r^O=DY&qrSw!=~ieeGP3sGEZU6YoAOR_F!sQ=TJ zqIQX{cP*!=UDDW^o{(x>5nfjFyX?a=)Cmoj6?&wD(=b%JrW9PB9XU*$ddlTGm0BXh zHJ8^mc?9F-CF4;kV-zkwyfr=6)TZc)?9O3o&?#3`YAb4AQK>CMe?`f7g4&AOSM=|EcJAjXlh^CyDdH6)COFYT|Hb~c*<3k+5xq% zsx^T|YZ4|`HJLFHBo+D}mEK@#6DFgxPlv1Do-(>pJEZpLN^Oaq(M@fx?U34|kL;g* z-PA^LOtxTzI;A|OQad74#?+cnp*4xAF+GlQwIgbeId-5#0A(otOdscpVl4Stg(Q}; z+9P}!BtPqYv`3KqY~UbALcCq0k1xBj1eR+mED0>v)b{aZuw2vk7>{7NX3%ktg zyH|wex;}l=y#z6CA&AFjgTABo4<1{oo>F~mtq&gw?y;@Mx`tA!k3H`AbiS=#TMBN- zMt)Z)^;!n%hDtQmQvHTfcUQfZ>NoW0l^$mruPX&NW~ZL1`VX^nppIVLSmCL| zj2ml9u4WxPH#Yl`u7l^sUcJ*}m}9yWk5e`GWed(!N0-N`f~;#{sF`Kqc%^%!^~^6& zXkhALBoHfIDHC`dC+}U;=t36$@m{q-t4fCLg%1zt@K9W_7d- zq8O!1;Y7vY+jcZmKu<-G0v#2)Filj9zf*>3q9On+6KJy116^SN6R_;50;nb{W`?cH ztOWKL;GwB}j0~z6McpZi$zgRv3q4Z^(-g(@aHTL!QOpkqVVa@_4oVw@Dd=BQif>W+ zb`{w2pa%6@RN6i5nZ}gY$f!)qesQ)sqC8E7b!nG0v0}z!nyN450xC{Z&E0bWElpEB zdRCZFn6APeee2pr{Q9bEe|7zs{}^?AT2Yr#qBw7XB@#j2LfMSebj4ohjbNojg<)@S z#xh#Bsqln~f_Mr+PAVgIo2u`dYhcxF>d0er0i3rfW{h<;M$E9|UzVthAOw3~vz!5$ zde*tDXTVk;04!+0N&uicQ|S|&E=!s~&%~Mrtb`JqD6s8VuME@WGjpqwQaDR#A04b~ z0zDNA8?a&&+bpoPkE2SUnx*>nPal>QL6-mc4@%#YjrqR%uckk!^e{JGvg?I+$;fv< zi@#~&uH2Dk`$JF}9RxIUS3dp-Xy~qd{Mpw^;oaHfbBLt7tC?h+@2+N&33+!u%w|JG zP?_C@Qus%u2f6;R9t-rHXF&$mcK4-l{ZSo$l!w^#N7cY4Gr{y;7fa#X?BsLR#7pMp z97Qaeo3Ayj$H0%$69sP zRRHXq@7n-k=X^g)fz+I@dVj^(38anr>g$8eEDZuC=>nync9Rs0_5zi5P0uFofzr}L z+5bIHeSi2v-nB+dM;`L7H3BL=q?!*m(QX7Z^pN7Paf4$*VR82T^VM%hEUspfL0YWp zn=2J%kQS?!Ubz6K#j34OdY^JsOvcBvh6~iZvmdXf;_wnaUQH!|@wjTSD~A}x5e5M( z$7)Z7pk0N%TRT+Nc#-Or9e$x&JOYWG*iwf>4J!3b6?c}=;qz0Vaq3Roai$xixe-_{p zBX~@rFOZIRW+(rvdSYZ}9vQMfbt+B+vZkOTO6st_9@2ED>Tjn$rA&rSb<_y60t##r zeDv^isA+)qmS^9(SeZ*;<4E`jsklkt5g&oSQ^Ijg_jY zl-_2&!kk*G^y}F}KTx-h;V(P211($RT2yHUGf_kF)+VL@$4yi)9Gg^9n_h_1fHG0v&ZhlP{p&?3mT|+iM1bGcEkqCT^G96$zw{c>qaLOi!pgtE+Wt(bjsx(48Y_IMz zmr4=jUFKSefG#iB&Pz<|-Bf9PQny`nR;Yl%~y-wUg7g2R#yu5 zRr`qJwFq+a>!`6$m2$7vm%{zkAyiKd1i6dqsj*)*x~RAYuQrsz11dbM;=~53Ah3(7 zghc~Y4ycxH6|=gO!q2K}bfE@PP1f$R1EkT(+Ff>l%-+e`9fv|$DyC>{S49v^Kw;v* z3WjQm=Dse=BG70z9p)iaQ*>(&XB4JS&5e@7Gte6)+s4$KN!p#No9s5l$rz@oV$?md zh;yzih3eMqi+EZ(Q4Ar z`*Vr}iu-ei$`W?JZt?>u=k)tEiJX5}3f8ZM*#$pUpO+Wr6a^?2=2pm>wlMbv2?*d3 zlARHEvYai_x}WPN83=)XbV)$~YkgqInRk)yZqK|_g=vxW=h0$X5H6OtXWQ3ZtsW1D zKAV%InDcBtyksJPjh=*51dxMsUv|)_6u+QrR%Flro9a`3L9>I3k&(=c65lMW$=(`Jo3Fw*RkoBVPZhwl6w(Bntsu!idM`3DQieJ$+ zA7oRnQv=GcXtIK0YAmL%^rnJn0B9QkV(Ln7DiHpa-c%s`E4`_)n7UfKBm)R0pl1?O zSL@m%&A62*HroB{xd#Z+XYu%_tQ~rKW|_BbJa&Ry{Xe4=AMX__+dk~<=@p2!#8Mm zA~#|@utB>Uq7l&C2JJEgMnHobw962P0ELa&>Az4%4BJ@EBx~5lY9?{PM(q*-rXoxm z#h;60vc$6byp!Gk3-$1jckVUTYX|-22%rzf{)^ zeLrWArRV*8P-W?P-%tA3EIsc_(40ijB&B$(uGyJ=?RpMOTXn%s!bF_4%?AyLW`K5l zfbehg{6P4(`Je$};Wi&Mi8yP!U-v;U0X>trY`b4u$`l)Ix9$U>+V0o=M1p3A);2{1 zf(q!VBxrW%TD!nf3eyhV(?%E&rX6~~QCx*|SSZE2bRM$aJo|AYVr+Yv$%*#GMuvJp=RPW+nV zhiPJV0RA6M%=zVXFfr$s)4{}?Urq-TbN&eai8+4+|3u+`q=86COYy>>W?raHJ}3Lp z2kP7H@Bdo8A2%)x3e7g1pGpuc$=)oh{X>^{3lL(#lE5ARfLO33DA{Eihy_ammgzmR zOs6s!Pqx>NQ`f7ZPv#sl_)q2>GWbshC7U*&4jfMgSXtRVe4<*TE?=29A;GdT zZ$eh=l|iF-g9OXU;266FnDq-dXsBzEH5~XaL(=a_7vygLYM|f9emPm4-SldZG^fKk z@gtW(d@Wl&S$(_jYe85vw`Q=?qQ-QSBSL%S5>bE zem%Pnz4GgUy9JA$EYq(C+=6AsrZPC|0)478Rua=dJIyF$nym}maSlk+>w@lfRsiYu zy5J~3bP~kt@}ZL;UMEBMZfYY8uFdV&PgOrrLpSG5$O(9J9$|6<-W<5)B{e7D%|Y)z z=^MBRYvJ75-ZD*Htjk+-4mkpE&4)*hz+3YOlOyofJi-#p+?t!22&I^5-9h2DK>M+i ztT52KL(a+DTsvi~k%RKKpwX^TKpNT>9DS_wWx;R_9O5AjZ417Bs%wa2^!D8Ea*PK0 zh9q^oJ@1elqqpZBl4JDtfq9RLG_*bMQIUqWOOFPUluBvm{TjT^Zy=jZ(}+?Vt7fCzL8a;kYj1o9|s`D@|d7YwiqGNthE3r_l4 zI@5N5G{?d0@H^D3p$GE@>S*9#9%+*LI2e@tI>gf=kag%xVow2N~b~iGu0$UCS}Wh&&6|6&d>#hNjZZgOD2UCE4siiDa4AWtuM%wOv`SZrIrny zmQyrBF)gQPgkoCg?wzS_gkoCA73*b7K@w#~cEfD7@{AcdMH3V=atcYW%m_<Sk`% zVRrh(>Xb78%$zwnQ8TN|oX};ZDTQcG=(5s4h~@~eF_ zd-zOs3k>&!?nwm*!#yESDwCDWF3g@Aa)i1e>+`xgJv%f<4J*$LUGg_I$zPyN{sNh2 zb3>B9^2#GK^Zw9$Fhi$gir*hrCa7$*)sTt?%41P&DV`tJ>>C(_0cYxGd8aCQ9tg94qhLza`WOgkL-3|t1b}bFr!9JF; ztd*leNA}r0YUjv~ya72WbmR?42Rgz=`%Fm{tm+6)whvQ48t4eWI>NQ5XrLoJZFsuN zHb8GXvv1w2c9%Qz24tt|%o`9ZIzzYq)S6>NXGprm_CSsionh}2J*0uo@YoZK<7;vJ z3!!c{3vq3cZTE$+w$5srl`)6qq70eAvOUzwD7_Fi*u)d)|AR)CQmbna*>Yo%IbFXH z=FpeUjg3$7&*o4c(RxSR_JgZOjlFu*FWdNE`|)#CV{j@ZcB0gp2dd4v7v!+BIc&5q z$CMfx-r@QYVA9XGv){~90|vdFcTj3nL+miHx2v%wdu5*LbNrUPhMab)AvFwqOHNF+ za>oC-z4ZaLMP2rBZl|1>KF;kFj*r7eyIxZVJ3kHw+fxUS(fT+Xa;`a)2{gq+&oT48 zRtA2To$tc{w6`m7M@}fa{CuaBc6Rys4uoiz%y)T7t(Du?p3uCco&kVpPfjE+=X?CL zrxc<+e%b>e+9T6m9(rV_+8btbFHsktTN@ESd;N?DQ4eTmJP>E?l^HJ+x2_Z)2y5<% z?ZlP+=RjC!NoR^5>*V-%h^NMd>i4RA$lHY&yAFje^9rQaq0r?^f!K8@tv z!XEbQ3nc6hg#+wY8g+8?{4&(jqrhsLXQeMgGTgm6SyC(}jEll9ty%LT)$2(9v^j25 zL`TL&yh`2~IAsi(+J508HAh`IH3|#nyegV<4xJh?q2$d$1mJ0rd&x1Fnh5N>j1d?O zPNc6}Pf$Lq{hJS~b!zCW$VGmgNkPww+zJL1t*Fr^j)6F0R)iz&l4Yf=#%Id4G_@r{gM8! ziZjiM9VPYV<$+>x<^u$4Yj(|Js()Ypv`;3c2dd_;t3hYvQs;GM z{pgHHom&scWvMed{8$fV6^%$4%15I3m^->S41v(OBJkI z5plAx4ame_5xILcr8KZ2;@-Q}HUQP?Y}Hb={nFKW19Gumoi`vees$#bfjTqeS4VCi z0Mfwf$n66_8dx2%51eK?Ks2n$n*LjzK5|XYFBg(EIln9fYjO|CLa-(}%r3ZfI);Bu z)M__QApC2h{>R#kN}Ytvx@_@(t3O<^E^k0?E9>$GKfp;qR@T@QYRn5$%H~;UxcL*3Cg!5pkzy|lU@0p z$bC@{bks5FV!2J$5lHcek=_#pt@rS*di9v= z+uBEWkW?;z7$t|fKJf(%Z^Tj9(=AT+0~rMNZ4wgmRQFND)0OoC-#&01%=-kk0^cPB zbZM(}$=3jHi^6`cjWXXpPz6cvN~_|9Z4oJ5UxmJGuQp4jA%fg2zOzP9WfrdbI3JwA z>XiI2NLCsf%b6Vmsc82F^R?=sE^^1jOp`X|+W=Nz*;3VT%CDW@<5_5(f{MDuJe zi$76TCd{btX{7Db1_<8)eVEA;)u)k5L{kdcr;$rU0~wl6Bd&pFm6ykheUbjmukz-T zseKXOHJaY=)H#uxj!O@+E=y% z1SlNH&U{w&D<7z4k|Xwk$bCI!^h7agaT8D~!gL_w{AZ^d_xOX6wuj(4rj3E#4}9)R zsmn!E3fIAi4}R^sBlr1(QNwX3m@`ClpGWS_MJY_5NAAuA zgz58$GuUvMw?umUWu)(jgVwLMotgDHz@9hrIdydDOY!O(^7@UAxOGCd@;SAB_yh#b zyNGFNLR|4B0@|7ocRecCptT7xHyQcjM3_*RoPF4-elvV>HIpRuCs#AcJfB?6B)*(1 zO#k7S2+L{Nyyw-gM@*|`lH=*LxH2lrO#f+dOKy{#E2aq(H*#wff*IM5UQo-*Gpea1 zt39LIC|MU~#9iImLT}`NKO-jPW(Sx&$IRG$3tFf7j#{7}U_PV_v6Npu1vs8LKmwv1&*S0|&br zcW3Deb?SHTj@`Yv&fLhVAvFw?<9B^2zBjH};EvzYi+f{^-;z_Pmw=m_-MT`ZHe{~v zI6^u;H+F#yq{`gb1vZe5&yC5T%jKe80&SjkAb;b)c{z^++dS_;N=4N>5D3pa??A~g zJ!l>H{d&1uJm?(=q8`vX5J=}96bDM@8cOj)am|aabCOhgDCT|ON0`DLpn zJBm>SiYH=s6a%vGKM}j57?7>wiI}69Ts#{X{wL#Xbh&kqF2;4}D}Azqd@BU5*o4;4yjW|)9FJ62v4UE6-gv6x1n-QgM`X*A1WZ~0d1%N@zQc1DqTwPOL5IxE>t9Y z_)=Wxo*s~a?jo_WI%|Jb9lUh4w+bOmt@cg?QfIXvXdqUt_5%&XiL3oU0~zSmGSD*7 zx`_YR$V3}FjKAson!FX6CTqM8DHT=kLm;iJ5g#tGhSH_=*`zh<(M#9o6f)ZDb3>)I z^|3o!cQK>AK4znpJr0PW>*GH5f(OLV_3@yS%zW-5gT28H5`SaphP)LS>jp{kvs+@4eB#4K8KZZz zWv{E#hQ8~KLWoiCdhY?L@~-zD5To9W*@ZXA9lKE+v$K838)}ofbZ5>X6MCn2A4;O- z#~BF6&e-Mnfw*sH>~j1-+_y6($1lraqs+_Q;=c2T?9Tb+gt^;04juS+d&dFc-|ZbI z8R}16bT^9QKJ|_RQ4eSx2c)e}z2lln@&35x&cr5JBrCl?E_6-TOShZEbK~0Y|Eqda zT`?|kYXnl-8ke}G5J;tQiCf2jm^ChO-3HR_af$0TkZzAl==N?2%O**(OiJ`E*_#{G zC&MNs?k<8{+Mb-ayNJOwgTNkqjevekPB`@U?vc1?n2W-~SuL^E>+nSC=8cN{?nhM9>wjsT@j;*KNoMlm}v$C0l# zNf6CW+;Id%J)jLDAU4lV*iEMeY^Np83Q5i5?F-&gx2WcO6Ta4ZMfRJL+z1{>^n&)` zTllSQ`GF+0AHGr`13W(o?T>;C#=!{e@zn@0XMW<2ibjA9^Aq>;2P44x`3WCE$o)bD zC_I>iN1F4k!EhpQoMq8~^g-!|{G7?Cm^!>DRRoYen6Prnp|K=pE=;uj>;eQK&_)3e z=PpcYo6Qmlgll2Kk1Axv1j4j1Awy<9&n%hk>EUd~-_*V3hjR|G=;6d=*-9po9!}i* z6cCPw6MlMNt-no?!)2@kE=koh}d)+qz#`BrPUH3(R!m`AD$!)L|*Z>wmSrRJCk}i!V=0yU2 zwz`UNAjqp&jj9^-?ztqiKm8E~8C?YS*CIv$=X0`T%C)|kZp69Rif8a#!43KRY}stxzXIA zSLZ`x@5%^l{-;?o)DW&t$}RyU5-46xT%y`wE3nCZBcRHwiA(N_0Q_3wem`I^H4xZ` z10ygRJRDfhWA)lZziB)#&Ql=?BP8DQvJ0*C>kq}yt(65*)*m3AUn?`hdY)Yfw!Uvx zJa2xu^m^`jWjz0eb+q^y0gUUa1!eL4dhx5Qm!cw1zJE=^)19Lw$C~K3D~=W~ZA=pR zu@0l{QmsjNw5=}~g-w3ZHVXJ)Q^M-vYoM^%d#x-Q(oZDbZ3w8cIWcatjey_ECxuJ3 z=99vuTJ1EF5Xb5*iTGQFam1qw=1v&G%-)Ak^@Ux zHdcy&Mv&NNGNWNs%#W|c(U^TO(T6IImTehet z-BY&nn+l2j@fgM8)^UZ37ws<(#+3{13Sczo^0bxgmoa-{K~FEpW+;oSys#tiew7#Yi3N9Hrxd!0 zg>Lp>0mQEp3mh!0UwLnXY`}DUVBH#tTPGDNdtqeUI=ME-@+X~u#chM~AquUC#4YoHXeN+vhHc-+|&77HLWDo9A zeFn`axSK$;xfoPKY8cq&YTS{1x=ZyPbVpu8R+VZ<4FivGHD+d~f1=t3&CF}apj1O@ z7jAD_JRYX#+`+( zho|3gHL~n$yVZ~rvI0M@Fe4wy*j7Vo82GT}(AdJ2s8I8l_PM*&K(0iELTmb{T!~ub zN;I#aA8CJkk2*n>=M{Lzkin-wBK`qC)&>(>2<%bL2#Br+3NE8>1laIE!M%Z^H~B7p^p(H5cI@?SKOfyTdeoI;fAz~z*Jo{eRWY0WsXA^rT6sfq zuvk#2x3_KKl|frj=sw8Alo8O-g2D+Wrsuha=>DQC-m5MczNnf>w$4S>Ofr~@3f%`( zm}K`{RN%Yl%N!GUNp{a(bwzneHIwWOORAY(N3#`wtudvEk7|1Kk@hiHa66`p?;DEZhaK#Q!jTGt~1$Q|GLcOEVVqeaIQ16gH zk#()BMCHzcURJcLF&OQg1+MG2B#a7J8kzXy20cBvdScNgL4h)2o{kw@;I$fHZU+0=b&`}JJX`NNqcIIflCF6no!k_=@msgD% z_Vae0I2z+J#ddm#btX+-bg2m=z>1Dyi+y@B0<7pLa@&@Xcuo)nH}is8u>QrYAYC`G814cm2RXzrcfR}VD7xS5nTjyIQ6!PH$$JLDhU}>({nmFjR8vU|ZK$S_ z7}`*DKiU&2St2(SInMmd8YM}Lw~GAiZc9mzX@09%Y)Ze)tVET>0RG>SjcnH69k8Vs zr)g7K^aXTfOOgB5kcuu1{VjW`S$}iD-->auN>`4ue=Bn2I;EnE+Ln&Xkf?(MN*^^;6^}?KbZV#i{`(8 P|3dzY+Fxynn_l~WMj{Yg diff --git a/csharp/src/Google.Protobuf/Reflection/Descriptor.pb.cs b/csharp/src/Google.Protobuf/Reflection/Descriptor.pb.cs index 2b91751a18..a3b2dae49c 100644 --- a/csharp/src/Google.Protobuf/Reflection/Descriptor.pb.cs +++ b/csharp/src/Google.Protobuf/Reflection/Descriptor.pb.cs @@ -236,16 +236,17 @@ namespace Google.Protobuf.Reflection { "Cgtzb3VyY2VfZmlsZRgCIAEoCRINCgViZWdpbhgDIAEoBRILCgNlbmQYBCAB", "KAUSSAoIc2VtYW50aWMYBSABKA4yNi5nb29nbGUucHJvdG9idWYuR2VuZXJh", "dGVkQ29kZUluZm8uQW5ub3RhdGlvbi5TZW1hbnRpYyIoCghTZW1hbnRpYxII", - "CgROT05FEAASBwoDU0VUEAESCQoFQUxJQVMQAiqSAgoHRWRpdGlvbhITCg9F", - "RElUSU9OX1VOS05PV04QABITCg5FRElUSU9OX1BST1RPMhDmBxITCg5FRElU", - "SU9OX1BST1RPMxDnBxIRCgxFRElUSU9OXzIwMjMQ6AcSEQoMRURJVElPTl8y", - "MDI0EOkHEhcKE0VESVRJT05fMV9URVNUX09OTFkQARIXChNFRElUSU9OXzJf", - "VEVTVF9PTkxZEAISHQoXRURJVElPTl85OTk5N19URVNUX09OTFkQnY0GEh0K", - "F0VESVRJT05fOTk5OThfVEVTVF9PTkxZEJ6NBhIdChdFRElUSU9OXzk5OTk5", - "X1RFU1RfT05MWRCfjQYSEwoLRURJVElPTl9NQVgQ/////wdCfgoTY29tLmdv", - "b2dsZS5wcm90b2J1ZkIQRGVzY3JpcHRvclByb3Rvc0gBWi1nb29nbGUuZ29s", - "YW5nLm9yZy9wcm90b2J1Zi90eXBlcy9kZXNjcmlwdG9ycGL4AQGiAgNHUEKq", - "AhpHb29nbGUuUHJvdG9idWYuUmVmbGVjdGlvbg==")); + "CgROT05FEAASBwoDU0VUEAESCQoFQUxJQVMQAiqnAgoHRWRpdGlvbhITCg9F", + "RElUSU9OX1VOS05PV04QABITCg5FRElUSU9OX0xFR0FDWRCEBxITCg5FRElU", + "SU9OX1BST1RPMhDmBxITCg5FRElUSU9OX1BST1RPMxDnBxIRCgxFRElUSU9O", + "XzIwMjMQ6AcSEQoMRURJVElPTl8yMDI0EOkHEhcKE0VESVRJT05fMV9URVNU", + "X09OTFkQARIXChNFRElUSU9OXzJfVEVTVF9PTkxZEAISHQoXRURJVElPTl85", + "OTk5N19URVNUX09OTFkQnY0GEh0KF0VESVRJT05fOTk5OThfVEVTVF9PTkxZ", + "EJ6NBhIdChdFRElUSU9OXzk5OTk5X1RFU1RfT05MWRCfjQYSEwoLRURJVElP", + "Tl9NQVgQ/////wdCfgoTY29tLmdvb2dsZS5wcm90b2J1ZkIQRGVzY3JpcHRv", + "clByb3Rvc0gBWi1nb29nbGUuZ29sYW5nLm9yZy9wcm90b2J1Zi90eXBlcy9k", + "ZXNjcmlwdG9ycGL4AQGiAgNHUEKqAhpHb29nbGUuUHJvdG9idWYuUmVmbGVj", + "dGlvbg==")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { }, new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Google.Protobuf.Reflection.Edition), }, null, new pbr::GeneratedClrTypeInfo[] { @@ -289,6 +290,11 @@ namespace Google.Protobuf.Reflection { /// [pbr::OriginalName("EDITION_UNKNOWN")] Unknown = 0, /// + /// A placeholder edition for specifying default behaviors *before* a feature + /// was first introduced. This is effectively an "infinite past". + /// + [pbr::OriginalName("EDITION_LEGACY")] Legacy = 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 /// files, but feature definitions must supply proto2/proto3 defaults for diff --git a/php/ext/google/protobuf/php-upb.c b/php/ext/google/protobuf/php-upb.c index 142344cf5a..88f11bc2bd 100644 --- a/php/ext/google/protobuf/php-upb.c +++ b/php/ext/google/protobuf/php-upb.c @@ -1569,10 +1569,11 @@ static const upb_MiniTable *messages_layout[33] = { const upb_MiniTableEnum google_protobuf_Edition_enum_init = { 64, - 8, + 9, { 0x7, 0x0, + 0x384, 0x3e6, 0x3e7, 0x3e8, @@ -1766,7 +1767,7 @@ const upb_MiniTableFile google_protobuf_descriptor_proto_upb_file_layout = { * regenerated. */ -static const char descriptor[12154] = {'\n', ' ', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'd', 'e', 's', 'c', 'r', 'i', 'p', +static const char descriptor[12175] = {'\n', ' ', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'd', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', '.', 'p', 'r', 'o', 't', 'o', '\022', '\017', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '\"', 'M', '\n', '\021', 'F', 'i', 'l', 'e', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'S', 'e', 't', '\022', '8', '\n', '\004', 'f', 'i', 'l', 'e', '\030', '\001', ' ', '\003', '(', '\013', '2', '$', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', @@ -2236,23 +2237,23 @@ static const char descriptor[12154] = {'\n', ' ', 'g', 'o', 'o', 'g', 'l', 'e', 'f', 'o', '.', 'A', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', '.', 'S', 'e', 'm', 'a', 'n', 't', 'i', 'c', 'R', '\010', 's', 'e', 'm', 'a', 'n', 't', 'i', 'c', '\"', '(', '\n', '\010', 'S', 'e', 'm', 'a', 'n', 't', 'i', 'c', '\022', '\010', '\n', '\004', 'N', 'O', 'N', 'E', '\020', '\000', '\022', '\007', '\n', '\003', 'S', 'E', 'T', '\020', '\001', '\022', '\t', '\n', '\005', 'A', 'L', 'I', 'A', 'S', '\020', '\002', '*', -'\222', '\002', '\n', '\007', 'E', 'd', 'i', 't', 'i', 'o', 'n', '\022', '\023', '\n', '\017', 'E', 'D', 'I', 'T', 'I', 'O', 'N', '_', 'U', 'N', -'K', 'N', 'O', 'W', 'N', '\020', '\000', '\022', '\023', '\n', '\016', 'E', 'D', 'I', 'T', 'I', 'O', 'N', '_', 'P', 'R', 'O', 'T', 'O', '2', -'\020', '\346', '\007', '\022', '\023', '\n', '\016', 'E', 'D', 'I', 'T', 'I', 'O', 'N', '_', 'P', 'R', 'O', 'T', 'O', '3', '\020', '\347', '\007', '\022', -'\021', '\n', '\014', 'E', 'D', 'I', 'T', 'I', 'O', 'N', '_', '2', '0', '2', '3', '\020', '\350', '\007', '\022', '\021', '\n', '\014', 'E', 'D', 'I', -'T', 'I', 'O', 'N', '_', '2', '0', '2', '4', '\020', '\351', '\007', '\022', '\027', '\n', '\023', 'E', 'D', 'I', 'T', 'I', 'O', 'N', '_', '1', -'_', 'T', 'E', 'S', 'T', '_', 'O', 'N', 'L', 'Y', '\020', '\001', '\022', '\027', '\n', '\023', 'E', 'D', 'I', 'T', 'I', 'O', 'N', '_', '2', -'_', 'T', 'E', 'S', 'T', '_', 'O', 'N', 'L', 'Y', '\020', '\002', '\022', '\035', '\n', '\027', 'E', 'D', 'I', 'T', 'I', 'O', 'N', '_', '9', -'9', '9', '9', '7', '_', 'T', 'E', 'S', 'T', '_', 'O', 'N', 'L', 'Y', '\020', '\235', '\215', '\006', '\022', '\035', '\n', '\027', 'E', 'D', 'I', -'T', 'I', 'O', 'N', '_', '9', '9', '9', '9', '8', '_', 'T', 'E', 'S', 'T', '_', 'O', 'N', 'L', 'Y', '\020', '\236', '\215', '\006', '\022', -'\035', '\n', '\027', 'E', 'D', 'I', 'T', 'I', 'O', 'N', '_', '9', '9', '9', '9', '9', '_', 'T', 'E', 'S', 'T', '_', 'O', 'N', 'L', -'Y', '\020', '\237', '\215', '\006', '\022', '\023', '\n', '\013', 'E', 'D', 'I', 'T', 'I', 'O', 'N', '_', 'M', 'A', 'X', '\020', '\377', '\377', '\377', '\377', -'\007', 'B', '~', '\n', '\023', 'c', 'o', 'm', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', 'B', -'\020', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', 's', 'H', '\001', 'Z', '-', 'g', 'o', 'o', 'g', -'l', 'e', '.', 'g', 'o', 'l', 'a', 'n', 'g', '.', 'o', 'r', 'g', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 't', 'y', -'p', 'e', 's', '/', 'd', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'p', 'b', '\370', '\001', '\001', '\242', '\002', '\003', 'G', 'P', 'B', -'\252', '\002', '\032', 'G', 'o', 'o', 'g', 'l', 'e', '.', 'P', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'R', 'e', 'f', 'l', 'e', 'c', -'t', 'i', 'o', 'n', +'\247', '\002', '\n', '\007', 'E', 'd', 'i', 't', 'i', 'o', 'n', '\022', '\023', '\n', '\017', 'E', 'D', 'I', 'T', 'I', 'O', 'N', '_', 'U', 'N', +'K', 'N', 'O', 'W', 'N', '\020', '\000', '\022', '\023', '\n', '\016', 'E', 'D', 'I', 'T', 'I', 'O', 'N', '_', 'L', 'E', 'G', 'A', 'C', 'Y', +'\020', '\204', '\007', '\022', '\023', '\n', '\016', 'E', 'D', 'I', 'T', 'I', 'O', 'N', '_', 'P', 'R', 'O', 'T', 'O', '2', '\020', '\346', '\007', '\022', +'\023', '\n', '\016', 'E', 'D', 'I', 'T', 'I', 'O', 'N', '_', 'P', 'R', 'O', 'T', 'O', '3', '\020', '\347', '\007', '\022', '\021', '\n', '\014', 'E', +'D', 'I', 'T', 'I', 'O', 'N', '_', '2', '0', '2', '3', '\020', '\350', '\007', '\022', '\021', '\n', '\014', 'E', 'D', 'I', 'T', 'I', 'O', 'N', +'_', '2', '0', '2', '4', '\020', '\351', '\007', '\022', '\027', '\n', '\023', 'E', 'D', 'I', 'T', 'I', 'O', 'N', '_', '1', '_', 'T', 'E', 'S', +'T', '_', 'O', 'N', 'L', 'Y', '\020', '\001', '\022', '\027', '\n', '\023', 'E', 'D', 'I', 'T', 'I', 'O', 'N', '_', '2', '_', 'T', 'E', 'S', +'T', '_', 'O', 'N', 'L', 'Y', '\020', '\002', '\022', '\035', '\n', '\027', 'E', 'D', 'I', 'T', 'I', 'O', 'N', '_', '9', '9', '9', '9', '7', +'_', 'T', 'E', 'S', 'T', '_', 'O', 'N', 'L', 'Y', '\020', '\235', '\215', '\006', '\022', '\035', '\n', '\027', 'E', 'D', 'I', 'T', 'I', 'O', 'N', +'_', '9', '9', '9', '9', '8', '_', 'T', 'E', 'S', 'T', '_', 'O', 'N', 'L', 'Y', '\020', '\236', '\215', '\006', '\022', '\035', '\n', '\027', 'E', +'D', 'I', 'T', 'I', 'O', 'N', '_', '9', '9', '9', '9', '9', '_', 'T', 'E', 'S', 'T', '_', 'O', 'N', 'L', 'Y', '\020', '\237', '\215', +'\006', '\022', '\023', '\n', '\013', 'E', 'D', 'I', 'T', 'I', 'O', 'N', '_', 'M', 'A', 'X', '\020', '\377', '\377', '\377', '\377', '\007', 'B', '~', '\n', +'\023', 'c', 'o', 'm', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', 'B', '\020', 'D', 'e', 's', +'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', 's', 'H', '\001', 'Z', '-', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'g', +'o', 'l', 'a', 'n', 'g', '.', 'o', 'r', 'g', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 't', 'y', 'p', 'e', 's', '/', +'d', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'p', 'b', '\370', '\001', '\001', '\242', '\002', '\003', 'G', 'P', 'B', '\252', '\002', '\032', 'G', +'o', 'o', 'g', 'l', 'e', '.', 'P', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'R', 'e', 'f', 'l', 'e', 'c', 't', 'i', 'o', 'n', }; static _upb_DefPool_Init *deps[1] = { @@ -2263,7 +2264,7 @@ _upb_DefPool_Init google_protobuf_descriptor_proto_upbdefinit = { deps, &google_protobuf_descriptor_proto_upb_file_layout, "google/protobuf/descriptor.proto", - UPB_STRINGVIEW_INIT(descriptor, 12154) + UPB_STRINGVIEW_INIT(descriptor, 12175) }; diff --git a/php/ext/google/protobuf/php-upb.h b/php/ext/google/protobuf/php-upb.h index 74a77ba658..820add1527 100644 --- a/php/ext/google/protobuf/php-upb.h +++ b/php/ext/google/protobuf/php-upb.h @@ -4545,6 +4545,7 @@ 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, diff --git a/ruby/ext/google/protobuf_c/ruby-upb.c b/ruby/ext/google/protobuf_c/ruby-upb.c index a34b081ef8..626d988fdb 100644 --- a/ruby/ext/google/protobuf_c/ruby-upb.c +++ b/ruby/ext/google/protobuf_c/ruby-upb.c @@ -1569,10 +1569,11 @@ static const upb_MiniTable *messages_layout[33] = { const upb_MiniTableEnum google_protobuf_Edition_enum_init = { 64, - 8, + 9, { 0x7, 0x0, + 0x384, 0x3e6, 0x3e7, 0x3e8, diff --git a/ruby/ext/google/protobuf_c/ruby-upb.h b/ruby/ext/google/protobuf_c/ruby-upb.h index 06bf3a9865..60196a0637 100755 --- a/ruby/ext/google/protobuf_c/ruby-upb.h +++ b/ruby/ext/google/protobuf_c/ruby-upb.h @@ -4947,6 +4947,7 @@ 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, diff --git a/upb/cmake/google/protobuf/descriptor.upb.h b/upb/cmake/google/protobuf/descriptor.upb.h index 8cbca671de..81d1d3d96f 100644 --- a/upb/cmake/google/protobuf/descriptor.upb.h +++ b/upb/cmake/google/protobuf/descriptor.upb.h @@ -57,6 +57,7 @@ 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, diff --git a/upb/cmake/google/protobuf/descriptor.upb_minitable.c b/upb/cmake/google/protobuf/descriptor.upb_minitable.c index d09c175145..1cc463de95 100644 --- a/upb/cmake/google/protobuf/descriptor.upb_minitable.c +++ b/upb/cmake/google/protobuf/descriptor.upb_minitable.c @@ -1171,10 +1171,11 @@ static const upb_MiniTable *messages_layout[33] = { const upb_MiniTableEnum google_protobuf_Edition_enum_init = { 64, - 8, + 9, { 0x7, 0x0, + 0x384, 0x3e6, 0x3e7, 0x3e8, diff --git a/upb/reflection/cmake/google/protobuf/descriptor.upb.h b/upb/reflection/cmake/google/protobuf/descriptor.upb.h index 8cbca671de..81d1d3d96f 100644 --- a/upb/reflection/cmake/google/protobuf/descriptor.upb.h +++ b/upb/reflection/cmake/google/protobuf/descriptor.upb.h @@ -57,6 +57,7 @@ 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, diff --git a/upb/reflection/cmake/google/protobuf/descriptor.upb_minitable.c b/upb/reflection/cmake/google/protobuf/descriptor.upb_minitable.c index d09c175145..1cc463de95 100644 --- a/upb/reflection/cmake/google/protobuf/descriptor.upb_minitable.c +++ b/upb/reflection/cmake/google/protobuf/descriptor.upb_minitable.c @@ -1171,10 +1171,11 @@ static const upb_MiniTable *messages_layout[33] = { const upb_MiniTableEnum google_protobuf_Edition_enum_init = { 64, - 8, + 9, { 0x7, 0x0, + 0x384, 0x3e6, 0x3e7, 0x3e8,