From d38777134bed8cdbf82cd47d812af8f8831f34a5 Mon Sep 17 00:00:00 2001 From: stephan Date: Wed, 30 Jul 2025 21:34:47 +0000 Subject: [PATCH] Move the flexarray union members from [527bbc1676a85a9] to the end of their respective objects. FossilOrigin-Name: 3082e07926695863bd5ef51c3c4803fbe267dc0d9b6ac9a717c225459f8988ba --- ext/fts5/fts5_index.c | 2 +- manifest | 22 +++++++++++----------- manifest.uuid | 2 +- src/resolve.c | 2 +- src/trigger.c | 2 +- src/vdbeInt.h | 2 +- src/wherecode.c | 2 +- test/fuzzcheck.c | 2 +- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/ext/fts5/fts5_index.c b/ext/fts5/fts5_index.c index c54a2337f5..6345352c59 100644 --- a/ext/fts5/fts5_index.c +++ b/ext/fts5/fts5_index.c @@ -6823,8 +6823,8 @@ int sqlite3Fts5IndexRollback(Fts5Index *p){ int sqlite3Fts5IndexReinit(Fts5Index *p){ Fts5Structure *pTmp; union { - u8 tmpSpace[SZ_FTS5STRUCTURE(1)]; Fts5Structure sFts; + u8 tmpSpace[SZ_FTS5STRUCTURE(1)]; } uFts; fts5StructureInvalidate(p); fts5IndexDiscardData(p); diff --git a/manifest b/manifest index 60776027eb..1fd3666b82 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Apply\salignment-related\spatches\ssuggested\sin\s[forum:41cd226375cd49c6\s|\sforum\spost\s41cd226375]. -D 2025-07-30T19:48:12.580 +C Move\sthe\sflexarray\sunion\smembers\sfrom\s[527bbc1676a85a9]\sto\sthe\send\sof\stheir\srespective\sobjects. +D 2025-07-30T21:34:47.039 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea @@ -113,7 +113,7 @@ F ext/fts5/fts5_buffer.c f1e6d0324d7c55329d340673befc26681a372a4d36086caa8d1ec7d F ext/fts5/fts5_config.c e7d8dd062b44a66cd77e5a0f74f23a2354cd1f3f8575afb967b2773c3384f7f8 F ext/fts5/fts5_expr.c be9e5f7f11d87e7bd3680832c93c13050fe351994b5052b0215c2ef40312c23a F ext/fts5/fts5_hash.c a6266cedd801ab7964fa9e74ebcdda6d30ec6a96107fa24148ec6b7b5b80f6e0 -F ext/fts5/fts5_index.c 3581c5db41da98d00c8f8edd310042b9715c8caa09765a48ad63c7941eb5e390 +F ext/fts5/fts5_index.c 2a1be0fb3c1b185f84b08b8032ba332c82defa182ff125833c0fecba0a4938b0 F ext/fts5/fts5_main.c e558225168845dc708abeb2ad10415696e5a3249bcba1810ba3c7ef80764962e F ext/fts5/fts5_storage.c 19bc7c4cbe1e6a2dd9849ef7d84b5ca1fcbf194cefc3e386b901e00e08bf05c2 F ext/fts5/fts5_tcl.c 7fb5a3d3404099075aaa2457307cb459bbc257c0de3dbd52b1e80a5b503e0329 @@ -784,7 +784,7 @@ F src/pragma.c 30b535d0a66348df844ee36f890617b4cf45e9a22dcbc47ec3ca92909c50aaf1 F src/prepare.c 1832be043fce7d489959aae6f994c452d023914714c4d5457beaed51c0f3d126 F src/printf.c 5f0c957af9699e849d786e8fbaa3baab648ca5612230dc17916434c14bc8698f F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c -F src/resolve.c b24641d27cb4552005e2de0d2c07bb5dd44c95f32e0bc407479985af75fa01a9 +F src/resolve.c 1fba451b87114182213ead347113d15c845dac4e61755754600c85595ec92244 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97 F src/select.c a6be657216e1fb72f85dad7df0dba0eb79fe76527c08caa65da8fe44f0e4db44 F src/shell.c.in 7918c9355667b3b348e5850f0dad9095476ef942ee3b96ee9b8bc2710adda1da @@ -847,7 +847,7 @@ F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9 F src/threads.c 4ae07fa022a3dc7c5beb373cf744a85d3c5c6c3c F src/tokenize.c 8400646d2830afc2f2dc465a75e3a92e4bedeea623f19dbd79c0c12d0dd6dda2 F src/treeview.c d85ce76e6d1498d781957c07cb234da6d77ce0ed2d196480d516f54dabc62279 -F src/trigger.c 905808ef9c34c7a386f7c3578af0fd216534eda5a06e10d863f574f3cca9abf0 +F src/trigger.c 2cbf345eb2913ee7dfa3622e753ac08c84ace17438f30ae97d98d41db5ca5a4f F src/update.c 3e5e7ff66fa19ebe4d1b113d480639a24cc1175adbefabbd1a948a07f28e37cf F src/upsert.c 215328c3f91623c520ec8672c44323553f12caeb4f01b1090ebdca99fdf7b4f1 F src/utf.c 7267c3fb9e2467020507601af3354c2446c61f444387e094c779dccd5ca62165 @@ -855,7 +855,7 @@ F src/util.c 36fb1150062957280777655976f3f9a75db236cb8207a0770ceae8d5ec17fcd3 F src/vacuum.c 1bacdd0a81d2b5dc1c508fbf0d938c89fa78dd8d5b46ec92686d44030d4f4789 F src/vdbe.c a5873cd566a0e2a0344a86dd946add9d34fae3feeae8b126277ef7af8dc11f91 F src/vdbe.h ea1f1b52f0efe422f80d88da3c57e4eadc72856e29a22f1ff08e502ec6ba5f08 -F src/vdbeInt.h 8f714d6c71c66853b2cf07da6d2fa8e9808931428a3dd14c576adbe2530152b0 +F src/vdbeInt.h 52896dd4d5b62190c53db14b09fc2484434eb594c963df0fa66eb8a94527b02e F src/vdbeapi.c f9a4881a9674fec3fa13da35044a1484d3c4b95f9ec891cc8ffb02ef2b7a41df F src/vdbeaux.c b701e5920fe74b907eb8211d1f63fef96adc65dfd6e1ad6ed0843c71d8c65205 F src/vdbeblob.c b3f0640db9642fbdc88bd6ebcc83d6009514cafc98f062f675f2c8d505d82692 @@ -870,7 +870,7 @@ F src/wal.h ba252daaa94f889f4b2c17c027e823d9be47ce39da1d3799886bbd51f0490452 F src/walker.c d5006d6b005e4ea7302ad390957a8d41ed83faa177e412f89bc5600a7462a014 F src/where.c f2f075bd17065922235632feb368efe92a7f03d42797eb575267574fbf6d4218 F src/whereInt.h 8d94cb116c9e06205c3d5ac87af065fc044f8cf08bfdccd94b6ea1c1308e65da -F src/wherecode.c 946edb42491a08672322194459ffcfd0369b89b38e8b4bec8c4463888fe80dd0 +F src/wherecode.c 71c5c6804b7f882dec8ec858758accae02fcfca13df3cc720f1f258e663ec7c5 F src/whereexpr.c 78c28a8da187816d5d82049f2e343fb39f4a8e30b5bf1bda9b96cecde40ca8bd F src/window.c d01227141f622f24fbe36ca105fbe6ef023f9fd98f1ccd65da95f88886565db5 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2 @@ -1285,7 +1285,7 @@ F test/fuzz3.test 70ba57260364b83e964707b9d4b5625284239768ab907dd387c740c0370ce3 F test/fuzz4.test c229bcdb45518a89e1d208a21343e061503460ac69fae1539320a89f572eb634 F test/fuzz_common.tcl b7197de6ed1ee8250a4f82d67876f4561b42ee8cbbfc6160dcb66331bad3f830 F test/fuzz_malloc.test f348276e732e814802e39f042b1f6da6362a610af73a528d8f76898fde6b22f2 -F test/fuzzcheck.c 0c9b1b41a13e980ae7c3a44df485faedfb584f7c55f9c1e00a72481801f2c01d +F test/fuzzcheck.c d425d07adcb31160d07f3070420ff217d30566c62eb9cf5fae61c0348bc7abed F test/fuzzdata1.db 3e86d9cf5aea68ddb8e27c02d7dfdaa226347426c7eb814918e4d95475bf8517 F test/fuzzdata2.db 128b3feeb78918d075c9b14b48610145a0dd4c8d6f1ca7c2870c7e425f5bf31f F test/fuzzdata3.db c6586d3e3cef0fbc18108f9bb649aa77bfc38aba @@ -2213,8 +2213,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 1ad0169b022b280bcaaf94a7fa231591be96b514230ab5c98fbf15cd7df842dd F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P e283d817e3a93a3cd42c7b79e08e5fb61cb4fa4734137b92f1748dbbe8b8b919 -R f3ca06a2bb82df67814293179013369c +P 527bbc1676a85a927352cd10a292afe041a72692ec0b1360e5a1ccaa19a32fcb +R 00821c919df363d35d3aadb90bd89ed6 U stephan -Z 38d94cdfd982403eb4386765bc680165 +Z 5544f0c534d5ebbfc15a076526ec0de5 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 73bc15fc05..b7c5f84280 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -527bbc1676a85a927352cd10a292afe041a72692ec0b1360e5a1ccaa19a32fcb +3082e07926695863bd5ef51c3c4803fbe267dc0d9b6ac9a717c225459f8988ba diff --git a/src/resolve.c b/src/resolve.c index 6029dda0ec..b60197866c 100644 --- a/src/resolve.c +++ b/src/resolve.c @@ -2284,8 +2284,8 @@ int sqlite3ResolveSelfReference( NameContext sNC; /* Name context for pParse->pNewTable */ int rc; union { - u8 srcSpace[SZ_SRCLIST_1]; /* Memory space for the fake SrcList */ SrcList sSrc; + u8 srcSpace[SZ_SRCLIST_1]; /* Memory space for the fake SrcList */ } uSrc; assert( type==0 || pTab!=0 ); diff --git a/src/trigger.c b/src/trigger.c index a4a652baf5..600f008f30 100644 --- a/src/trigger.c +++ b/src/trigger.c @@ -1041,8 +1041,8 @@ static void codeReturningTrigger( Select sSelect; SrcList *pFrom; union { - u8 fromSpace[SZ_SRCLIST_1]; SrcList sSrc; + u8 fromSpace[SZ_SRCLIST_1]; } uSrc; assert( v!=0 ); diff --git a/src/vdbeInt.h b/src/vdbeInt.h index 856a83764b..ca28b075a5 100644 --- a/src/vdbeInt.h +++ b/src/vdbeInt.h @@ -558,8 +558,8 @@ struct PreUpdate { Index *pPk; /* PK index if pTab is WITHOUT ROWID */ sqlite3_value **apDflt; /* Array of default values, if required */ union { - u8 keyinfoSpace[SZ_KEYINFO_0]; /* Space to hold pKeyinfo[0] content */ KeyInfo sKey; + u8 keyinfoSpace[SZ_KEYINFO_0]; /* Space to hold pKeyinfo[0] content */ } uKey; }; diff --git a/src/wherecode.c b/src/wherecode.c index a1a9c5d8b8..1efa34a5da 100644 --- a/src/wherecode.c +++ b/src/wherecode.c @@ -2846,8 +2846,8 @@ SQLITE_NOINLINE void sqlite3WhereRightJoinLoop( SrcItem *pTabItem = &pWInfo->pTabList->a[pLevel->iFrom]; SrcList *pFrom; union { - u8 fromSpace[SZ_SRCLIST_1]; SrcList sSrc; + u8 fromSpace[SZ_SRCLIST_1]; } uSrc; Bitmask mAll = 0; int k; diff --git a/test/fuzzcheck.c b/test/fuzzcheck.c index 11b37b1290..6157dc4431 100644 --- a/test/fuzzcheck.c +++ b/test/fuzzcheck.c @@ -542,8 +542,8 @@ static void blobListLoadFromDb( int rc; char *z2; union { - unsigned char tmp[SZ_BLOB(8)]; Blob * sBlob; + unsigned char tmp[SZ_BLOB(8)]; } uBlob; head = &uBlob.sBlob; -- 2.47.2