Add some missing VdbeCoverage() macros.

FossilOrigin-Name: d03b611302f68483770d49b113b4ed685ba03526d2007647c306f8ec7ae697d2

diff --git a/manifest b/manifest
index 781993999cb9d1a735d2841c013eb5645c4cccab..726085e9cc348a276dd45de531b758061068a09f 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Improvements\sto\sVdbeCoverage\smacros.
-D 2019-03-30T20:43:40.472
+C Add\ssome\smissing\sVdbeCoverage()\smacros.
+D 2019-03-31T18:17:00.420
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -606,7 +606,7 @@ F src/where.c ff2955dc2743c1af05ba5a8232ab72724d9a63b76dbee256368f40fd3ef82db5
 F src/whereInt.h 5f14db426ca46a83eabab1ae9aa6d4b8f27504ad35b64c290916289b1ddb2e88
 F src/wherecode.c 9572aab9eff42859a5f3e9b212f704521a84bf77e444217f0339d8b811e6333f
 F src/whereexpr.c 90859652920f153d2c03f075488744be2926625ebd36911bcbcb17d0d29c891c
-F src/window.c a63ef839f4987d789cb595a38cf5063a38ab47bb1d0357af65121363fae4734d
+F src/window.c bd1e1c2674546d0a61c04895352b2651756136757c2c399bd11b6cc609416e0d
 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 F test/affinity2.test a6d901b436328bd67a79b41bb0ac2663918fe3bd
 F test/affinity3.test 6a101af2fc945ce2912f6fe54dd646018551710d
@@ -1814,8 +1814,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P bb643bac535ac7d5fb4c13edb8782cd13540bbc7d2b2deb689f4ca8d1914f422 b5f72f10f2dfdbee9fe98c63ffb933e841203790746a920b99df14ca5c14127c
-R 856eb43817b0dd995ab38a2e36f5cc99
-T +closed b5f72f10f2dfdbee9fe98c63ffb933e841203790746a920b99df14ca5c14127c
+P 10ee9e337e5f8a846dc827f6deb07930a790ac9d290b62f73de59454e465d5a1
+R fd7db6dc20c9b2bda6c18b4b5cbaaa9c
 U drh
-Z a58fae3a822064c17bae1f6aac94f517
+Z b4b7ee1b7eb57d74293b0bd1a71392b1

diff --git a/manifest.uuid b/manifest.uuid
index 65368b72d7e68ed9bf694fea93067e1a87527250..0c9fcbb445e47c4316ed36670c986a57e3b632d9 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-10ee9e337e5f8a846dc827f6deb07930a790ac9d290b62f73de59454e465d5a1
\ No newline at end of file
+d03b611302f68483770d49b113b4ed685ba03526d2007647c306f8ec7ae697d2
\ No newline at end of file

diff --git a/src/window.c b/src/window.c
index 2494eb678c3bf658384bf5ea47fcb633cd8a627d..b766956f9c522844054411cfec364d8afc2ddafb 100644 (file)
--- a/src/window.c
+++ b/src/window.c
@@ -1323,11 +1323,11 @@ static void windowCheckValue(Parse *pParse, int reg, int eCond){
     VdbeCoverageIf(v, eCond==2);
   }
   sqlite3VdbeAddOp3(v, aOp[eCond], regZero, sqlite3VdbeCurrentAddr(v)+2, reg);
-  VdbeCoverageNeverNullIf(v, eCond==0);
-  VdbeCoverageNeverNullIf(v, eCond==1);
-  VdbeCoverageNeverNullIf(v, eCond==2);
-  VdbeCoverageNeverNullIf(v, eCond==3);
-  VdbeCoverageNeverNullIf(v, eCond==4);
+  VdbeCoverageIf(v, eCond==0);
+  VdbeCoverageIf(v, eCond==1);
+  VdbeCoverageIf(v, eCond==2);
+  VdbeCoverageIf(v, eCond==3);
+  VdbeCoverageIf(v, eCond==4);
   sqlite3MayAbort(pParse);
   sqlite3VdbeAddOp2(v, OP_Halt, SQLITE_ERROR, OE_Abort);
   sqlite3VdbeAppendP4(v, (void*)azErr[eCond], P4_STATIC);
@@ -1577,6 +1577,7 @@ static void windowFullScan(WindowCodeArg *p){
 
   if( pMWin->eExclude==TK_CURRENT ){
     sqlite3VdbeAddOp3(v, OP_Eq, regCRowid, lblNext, regRowid);
+    VdbeCoverage(v);
   }else if( pMWin->eExclude!=TK_NO ){
     int addr;
     int addrEq = 0;
@@ -1587,6 +1588,7 @@ static void windowFullScan(WindowCodeArg *p){
     }
     if( pMWin->eExclude==TK_TIES ){
       addrEq = sqlite3VdbeAddOp3(v, OP_Eq, regCRowid, 0, regRowid);
+      VdbeCoverage(v);
     }
     if( pKeyInfo ){
       windowReadPeerValues(p, csr, regPeer);