From: drh <> Date: Wed, 2 Jul 2025 17:43:59 +0000 (+0000) Subject: Fix VDBE coverage X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=eb27359e5e6e0258947ef85124229ca632d838af;p=thirdparty%2Fsqlite.git Fix VDBE coverage FossilOrigin-Name: ff593a16d61cc5c588d1737deb822abb90b1759475a4cabfcf608978b1191487 --- diff --git a/manifest b/manifest index e505968bd6..e466a39061 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Early\sexit\sif\sone\sof\sthe\sinner\sloops\sof\sa\s3-way\sor\slarger\sjoin\sis\san\nempty\stable. -D 2025-07-02T14:53:48.889 +C Fix\sVDBE\scoverage +D 2025-07-02T17:43:59.873 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea @@ -785,7 +785,7 @@ F src/printf.c 71b6d3a0093bf23f473e25480ca0024e8962681506c75f4ffd3d343a3f0ab113 F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c F src/resolve.c d40fe18d7c2fd0339f5846ffcf7d6809866e380acdf14c76fb2af87e9fe13f64 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97 -F src/select.c 0d30f9718594b6c208373c28c174432dda5c555bd18a5a3d37fd623fdb64aafb +F src/select.c fc2fe502971df1205a3231d3b3c8b0cc9ed4779cecbd060952c9558e22b6b02d F src/shell.c.in 4f14a1f5196b6006abc8e73cc8fd6c1a62cf940396f8ba909d6711f35f074bb6 F src/sqlite.h.in 5c54f2461a1ea529bab8499148a2b238e2d4bb571d59e8ea5322d0c190abb693 F src/sqlite3.rc 015537e6ac1eec6c7050e17b616c2ffe6f70fca241835a84a4f0d5937383c479 @@ -867,7 +867,7 @@ F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9 F src/wal.c 20be6f0a25a80b7897cf2a5369bfd37ef198e6f0b6cdef16d83eee856056b159 F src/wal.h ba252daaa94f889f4b2c17c027e823d9be47ce39da1d3799886bbd51f0490452 F src/walker.c d5006d6b005e4ea7302ad390957a8d41ed83faa177e412f89bc5600a7462a014 -F src/where.c e03e764dcbc205d40b01a033b744c583b090f29df56d2efaa1a12a79d8a1b053 +F src/where.c b11e56a24d01ae9b293f702c9de6dd16ced6b886be0d7cccb8bdeb62c8d92362 F src/whereInt.h 8d94cb116c9e06205c3d5ac87af065fc044f8cf08bfdccd94b6ea1c1308e65da F src/wherecode.c 504f3c1270c3ffd51ebcdf7a31de08aa51a63b33a2ccdf8f5736afe3dfa73d45 F src/whereexpr.c 566ca4382e07a4ba1fd86c97ae0781cdf84004c7d9c59466bf5db75733548807 @@ -2208,8 +2208,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 13f096ae8a850a05d4a8684561066f11693ee66289e6568c44ef32822cca06f6 -R 004cef124bcae73b595e9860d518af27 +P eaad6ac707a5960d9518d4049b7b1759e7512727ce87be3c402408144bda0a97 +R 19ae64c3af637e68252816fb2a35fc7d U drh -Z 93bde8048b1cba4fc1e568dc39724e75 +Z 04fda6f3c6a7b8123cd1480694a7568d # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 3c9b3a2f20..faaf6064f7 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -eaad6ac707a5960d9518d4049b7b1759e7512727ce87be3c402408144bda0a97 +ff593a16d61cc5c588d1737deb822abb90b1759475a4cabfcf608978b1191487 diff --git a/src/select.c b/src/select.c index 017fde9013..d35103cddf 100644 --- a/src/select.c +++ b/src/select.c @@ -3189,7 +3189,7 @@ static int multiSelect( iBreak = sqlite3VdbeMakeLabel(pParse); iCont = sqlite3VdbeMakeLabel(pParse); computeLimitRegisters(pParse, p, iBreak); - sqlite3VdbeAddOp2(v, OP_Rewind, tab1, iBreak); VdbeCoverage(v); + sqlite3VdbeAddOp1(v, OP_Rewind, tab1); r1 = sqlite3GetTempReg(pParse); iStart = sqlite3VdbeAddOp2(v, OP_RowData, tab1, r1); sqlite3VdbeAddOp4Int(v, OP_NotFound, tab2, iCont, r1, 0); diff --git a/src/where.c b/src/where.c index 28af499989..4a0c3988cb 100644 --- a/src/where.c +++ b/src/where.c @@ -7139,6 +7139,7 @@ WhereInfo *sqlite3WhereBegin( && pLevel->addrHalt==pWInfo->a[0].addrHalt ){ sqlite3VdbeAddOp2(v, OP_IfEmpty, pTabItem->iCursor, pLevel->addrHalt); + VdbeCoverage(v); } }else{ sqlite3TableLock(pParse, iDb, pTab->tnum, 0, pTab->zName);