From: dan <dan@noemail.net>
Date: Wed, 21 Aug 2019 19:58:11 +0000 (+0000)
Subject: Add missing VdbeCoverage() macros to new code.
X-Git-Tag: version-3.30.0~101^2~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f236b21f4b3dba4c104fcda5eb582297be89efe9;p=thirdparty%2Fsqlite.git

Add missing VdbeCoverage() macros to new code.

FossilOrigin-Name: b1cbcdc6eb42cca0c42a05e0d6ba4c6c7f09adff0c59ecfc5b434a94dec07a41
---

diff --git a/manifest b/manifest
index b49de46348..d90e4f1fad 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Disable\sbroken\stest\scase\sin\sexpert1.test.
-D 2019-08-21T17:46:34.434
+C Add\smissing\sVdbeCoverage()\smacros\sto\snew\scode.
+D 2019-08-21T19:58:11.253
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -609,11 +609,11 @@ F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
 F src/wal.c bbd6838bd79c0a32144d482fb0b6a9d2d1a252fb3b16d5005ec30f2f80413b0d
 F src/wal.h 606292549f5a7be50b6227bd685fa76e3a4affad71bb8ac5ce4cb5c79f6a176a
 F src/walker.c d5a94907dcac990e31976be9dc769d17f6a806782593d6aec9d760ee01ec22cd
-F src/where.c efdaf72cbae66b77fa0e5acd2036b162a9ba45e1109b64ccc72d2c69328feb35
+F src/where.c b49039ad3e7947f6a21735839ba126fc11a21861eeb2483aa5bddae03eea50a8
 F src/whereInt.h 807766a6a92893dbba8a887e5b13466d2257ce07a84cf1be0aae2c41aee3bf4f
 F src/wherecode.c b8f285f93d53274d36d279f3aeaef67cdd28c2d899e06c5d813fb8a4ba6be1b9
 F src/whereexpr.c 5cce1fd11876086890a27c05e0cb75ca97ba64ba6984f72154039f1cfd2e69cc
-F src/window.c 94dccce0568dbcc65658d762e5b11c390fd5509d40e73205cb7f0c22f0051532
+F src/window.c 3ea716bb0dd5ffc8cdbaa48baffc525958b51bc61b2afd73a56baccfcd7ceb2f
 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 F test/affinity2.test 34f2cf88e2a08d7a54a1fa2c9773ba81bf8b8216c0895e476118a1285540ee71
 F test/affinity3.test 6a101af2fc945ce2912f6fe54dd646018551710d
@@ -1837,7 +1837,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 6153bcf41a9aa0497f8210311c99ac23846223068f2b6a3a1c2d9dec7673c7e1
-R 705b56b5be1b7e1fefeda4caba19be14
+P 73e30c2e92ccab274ff7cee48511c461de148786bb9d338921c1ecb193822282
+R edcea46a2acf7bb6888ff4c7d19a220b
 U dan
-Z c64ec774c7130f6a813c233a9a841076
+Z 27ad915f85c1608e423344937ae2bcdc
diff --git a/manifest.uuid b/manifest.uuid
index f2e61edbdf..7acb4c891f 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-73e30c2e92ccab274ff7cee48511c461de148786bb9d338921c1ecb193822282
\ No newline at end of file
+b1cbcdc6eb42cca0c42a05e0d6ba4c6c7f09adff0c59ecfc5b434a94dec07a41
\ No newline at end of file
diff --git a/src/where.c b/src/where.c
index 72bdc60eb1..c5733e16af 100644
--- a/src/where.c
+++ b/src/where.c
@@ -5218,12 +5218,9 @@ void sqlite3WhereEnd(WhereInfo *pWInfo){
       if( pLevel->regBignull ){
         sqlite3VdbeResolveLabel(v, pLevel->addrBignull);
         addr = sqlite3VdbeAddOp1(v, OP_If, pLevel->regBignull);
+        VdbeCoverage(v);
         sqlite3VdbeAddOp2(v, OP_Integer, 1, pLevel->regBignull);
         sqlite3VdbeAddOp2(v, OP_Goto, 0, pLevel->p2-1);
-        sqlite3VdbeChangeP5(v, pLevel->p5);
-        VdbeCoverage(v);
-        VdbeCoverageIf(v, pLevel->op==OP_Next);
-        VdbeCoverageIf(v, pLevel->op==OP_Prev);
         sqlite3VdbeJumpHere(v, addr);
       }
 #ifndef SQLITE_DISABLE_SKIPAHEAD_DISTINCT
diff --git a/src/window.c b/src/window.c
index 80dfd612c4..d3603e7a1e 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1907,8 +1907,14 @@ static void windowCodeRangeTest(
     addr = sqlite3VdbeAddOp1(v, OP_NotNull, reg1); VdbeCoverage(v);
     switch( op ){
       case OP_Ge: sqlite3VdbeAddOp2(v, OP_Goto, 0, lbl); break;
-      case OP_Gt: sqlite3VdbeAddOp2(v, OP_NotNull, reg2, lbl); break;
-      case OP_Le: sqlite3VdbeAddOp2(v, OP_IsNull, reg2, lbl); break;
+      case OP_Gt: 
+        sqlite3VdbeAddOp2(v, OP_NotNull, reg2, lbl); 
+        VdbeCoverage(v); 
+        break;
+      case OP_Le: 
+        sqlite3VdbeAddOp2(v, OP_IsNull, reg2, lbl); 
+        VdbeCoverage(v); 
+        break;
       default: assert( op==OP_Lt ); /* no-op */
     }
     sqlite3VdbeAddOp2(v, OP_Goto, 0, sqlite3VdbeCurrentAddr(v)+2);