From: drh <drh@noemail.net>
Date: Mon, 1 Apr 2019 15:55:38 +0000 (+0000)
Subject: Mark rowid-comparison opcodes as never-null for VDBE coverage tracking
X-Git-Tag: version-3.28.0~61
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=83c5bb997a496d00f50b63a9af8feccb33a2b138;p=thirdparty%2Fsqlite.git

Mark rowid-comparison opcodes as never-null for VDBE coverage tracking
purposes.

FossilOrigin-Name: a69bb4f257500e40ef4056d5628ef25266def5bcef07eebdb471a79fffe80237
---

diff --git a/manifest b/manifest
index ad30446b14..dee68c21bd 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Improved\sVDBE\sbranch\scoverage\sin\sthe\srun-time\sframe-spec\serror\sdetection\nlogic\sof\swindow\sfunctions.
-D 2019-04-01T14:30:30.127
+C Mark\srowid-comparison\sopcodes\sas\snever-null\sfor\sVDBE\scoverage\stracking\npurposes.
+D 2019-04-01T15:55:38.356
 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 76a3a9bea5e1b6823fdcab93601fdb5ec8ccb619cbf3142b9d67a8e3a262dff1
+F src/window.c 8d840b83ecbe3ef29def5daab64b10bc5c6dde4f42901e07f1bb66a997788f13
 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 F test/affinity2.test a6d901b436328bd67a79b41bb0ac2663918fe3bd
 F test/affinity3.test 6a101af2fc945ce2912f6fe54dd646018551710d
@@ -1814,7 +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 8681750e855a020ee374cb9f973f701a72068e33f97d0101a4fab3a228e5ebda
-R d88739e3fc7524dd1061128e4965a1fa
+P f56d305a7bad6608d51d8c8cef417ddb66cff50f0a75d28554ea669e47f3d90d
+R e9bd711a9d06e12f07abf04ecdf4ba62
 U drh
-Z 0bbe78fa3e82a47d788c8c31972dadc2
+Z 575007d3367381647c876aa4c0326b9d
diff --git a/manifest.uuid b/manifest.uuid
index 6a58a8dca1..29f913824b 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f56d305a7bad6608d51d8c8cef417ddb66cff50f0a75d28554ea669e47f3d90d
\ No newline at end of file
+a69bb4f257500e40ef4056d5628ef25266def5bcef07eebdb471a79fffe80237
\ No newline at end of file
diff --git a/src/window.c b/src/window.c
index 87dfac7470..6a476dd483 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1577,7 +1577,7 @@ static void windowFullScan(WindowCodeArg *p){
 
   if( pMWin->eExclude==TK_CURRENT ){
     sqlite3VdbeAddOp3(v, OP_Eq, regCRowid, lblNext, regRowid);
-    VdbeCoverage(v);
+    VdbeCoverageNeverNull(v);
   }else if( pMWin->eExclude!=TK_NO ){
     int addr;
     int addrEq = 0;
@@ -1588,7 +1588,7 @@ static void windowFullScan(WindowCodeArg *p){
     }
     if( pMWin->eExclude==TK_TIES ){
       addrEq = sqlite3VdbeAddOp3(v, OP_Eq, regCRowid, 0, regRowid);
-      VdbeCoverage(v);
+      VdbeCoverageNeverNull(v);
     }
     if( pKeyInfo ){
       windowReadPeerValues(p, csr, regPeer);
@@ -2526,7 +2526,7 @@ void sqlite3WindowCodeStep(
   sqlite3VdbeAddOp2(v, OP_NewRowid, csrWrite, regRowid);
   sqlite3VdbeAddOp3(v, OP_Insert, csrWrite, regRecord, regRowid);
   addrNe = sqlite3VdbeAddOp3(v, OP_Ne, pMWin->regOne, 0, regRowid);
-  VdbeCoverage(v);
+  VdbeCoverageNeverNull(v);
 
   /* This block is run for the first row of each partition */
   s.regArg = windowInitAccum(pParse, pMWin);