Adjustments to VdbeCoverage macros to deal with byte-code branches that

can never be taken in some directions.

FossilOrigin-Name: b170c0092b1d0c47dd700843f0c870e51181939607a897fbcae55a58042160f9

diff --git a/manifest b/manifest
index 63a390e8fec7c9678229fb33b292881f3236ced4..82b160951de671fdbee10d6d774a5e1bf89a7378 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\sincorrect\sALWAYS()\smacros\sfrom\sthe\swindow\sfunction\slogic.
-D 2018-07-10T23:31:17.172
+C Adjustments\sto\sVdbeCoverage\smacros\sto\sdeal\swith\sbyte-code\sbranches\sthat\ncan\snever\sbe\staken\sin\ssome\sdirections.
+D 2018-07-11T03:27:52.496
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 0a3a6c81e6fcb969ff9106e882f0a08547014ba463cb6beca4c4efaecc924ee6
@@ -584,7 +584,7 @@ F src/where.c 7afd00cf7fb57a2770e7ab35deae105dc5b70b414c5018543850da999bfec8d6
 F src/whereInt.h b90ef9b9707ef750eab2a7a080c48fb4900315033274689def32d0cf5a81ebe4
 F src/wherecode.c fe23a55294b4c94bf658d2a6eb7996170dd563bf33af4c3e5d71aff3483e4b08
 F src/whereexpr.c 571618c67a3eb5ce0f1158c2792c1aee9b4a4a264392fc4fb1b35467f80abf9a
-F src/window.c 59a256d21707067759f3e3e4014e57b916bc296f4a1f3ae09c2e27ff1ea3b39f
+F src/window.c c61434ce7e35b7d76b3321dec39e10e79061c10eed1e3d7976c87dbdd77aefb5
 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 F test/affinity2.test a6d901b436328bd67a79b41bb0ac2663918fe3bd
 F test/affinity3.test 6a101af2fc945ce2912f6fe54dd646018551710d
@@ -1746,7 +1746,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 f7c239e959004cb90dc8537ab2e1fca5f26ef21f4f6f3dfd743a05a55e705090
-R 4ee8e8b0cdbc1d8a8525b858e569a01e
+P 94ac51cc4e7fdf484214e1936fc96104b96134632a8eb99558b3af743ac8bb8b
+R 3c2abc82cb054facab44530a72038375
 U drh
-Z cc333ee9ff40d8ebbc1003ae2a9f5622
+Z 9468a70529339ad8af6a1cde8d80384d

diff --git a/manifest.uuid b/manifest.uuid
index 2ee6f63a30b5e57f4bb34bfc58bf2d83180aab1a..c4d3540a93f7d184067e796637dfb70968fd3f0e 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-94ac51cc4e7fdf484214e1936fc96104b96134632a8eb99558b3af743ac8bb8b
\ No newline at end of file
+b170c0092b1d0c47dd700843f0c870e51181939607a897fbcae55a58042160f9
\ No newline at end of file

diff --git a/src/window.c b/src/window.c
index a2c3481509a9552b474796f7169171a8dd6de057..ce85c44608e8092d75d8a4221a286708e0812942 100644 (file)
--- a/src/window.c
+++ b/src/window.c
@@ -1149,7 +1149,7 @@ static void windowAggStep(
         sqlite3VdbeAddOp2(v, OP_IdxInsert, pWin->csrApp, pWin->regApp+2);
       }else{
         sqlite3VdbeAddOp4Int(v, OP_SeekGE, pWin->csrApp, 0, regArg, 1);
-        VdbeCoverage(v);
+        VdbeCoverageNeverTaken(v);
         sqlite3VdbeAddOp1(v, OP_Delete, pWin->csrApp);
         sqlite3VdbeJumpHere(v, sqlite3VdbeCurrentAddr(v)-2);
       }
@@ -1280,7 +1280,7 @@ static void windowPartitionCache(
     addr = sqlite3VdbeAddOp3(v, OP_Compare, regNewPart, pMWin->regPart,nPart);
     sqlite3VdbeAppendP4(v, (void*)pKeyInfo, P4_KEYINFO);
     sqlite3VdbeAddOp3(v, OP_Jump, addr+2, addr+4, addr+2);
-    VdbeCoverage(v);
+    VdbeCoverageEqNe(v);
     sqlite3VdbeAddOp3(v, OP_Copy, regNewPart, pMWin->regPart, nPart-1);
     sqlite3VdbeAddOp2(v, OP_Gosub, regFlushPart, lblFlushPart);
     VdbeComment((v, "call flush_partition"));
@@ -1338,8 +1338,8 @@ static void windowReturnOneRow(
       sqlite3VdbeAddOp3(v, OP_Add, tmpReg, pWin->regApp, tmpReg);
       sqlite3VdbeAddOp3(v, OP_Gt, pWin->regApp+1, lbl, tmpReg);
       VdbeCoverageNeverNull(v);
-      sqlite3VdbeAddOp3(v, OP_SeekRowid, csr, lbl, tmpReg);
-      VdbeCoverage(v);
+      sqlite3VdbeAddOp3(v, OP_SeekRowid, csr, 0, tmpReg);
+      VdbeCoverageNeverTaken(v);
       sqlite3VdbeAddOp3(v, OP_Column, csr, pWin->iArgCol, pWin->regResult);
       sqlite3VdbeResolveLabel(v, lbl);
       sqlite3ReleaseTempReg(pParse, tmpReg);
@@ -1731,7 +1731,7 @@ static void windowCodeRowExprStep(
       sqlite3VdbeAddOp2(v, OP_Goto, 0, lblSkipInverse);
     }else{
       sqlite3VdbeAddOp2(v, OP_Next, csrStart, sqlite3VdbeCurrentAddr(v)+1);
-      VdbeCoverage(v);
+      VdbeCoverageAlwaysTaken(v);
     }
     windowAggStep(pParse, pMWin, csrStart, 1, regArg, regSize);
     sqlite3VdbeResolveLabel(v, lblSkipInverse);
@@ -2053,7 +2053,7 @@ static void windowCodeDefaultStep(
       addr = sqlite3VdbeAddOp3(v, OP_Compare, regNewPart, pMWin->regPart,nPart);
       sqlite3VdbeAppendP4(v, (void*)pKeyInfo, P4_KEYINFO);
       addrJump = sqlite3VdbeAddOp3(v, OP_Jump, addr+2, 0, addr+2);
-      VdbeCoverage(v);
+      VdbeCoverageEqNe(v);
       windowAggFinal(pParse, pMWin, 1);
       if( pOrderBy ){
         addrGoto = sqlite3VdbeAddOp0(v, OP_Goto);