Fix VDBE coverage macros.

FossilOrigin-Name: ebe100de55ccdf6abccde5d8e6e96099b6e8dc3527f1441265e2b86b6661a66b

diff --git a/manifest b/manifest
index 6ce292b9fdde323784b6ed42d0d8a82f667fa1a4..687d46dab347822dc4f1e6eb668613d48cf27a0b 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Omit\sthe\sSQLITE_STOREP2\sand\sSQLITE_KEEPNULL\soptions\sfrom\sthe\scomparison\nopcodes,\sallowing\sthem\sto\srun\sfaster.\s\sThis\srequired\srefactoring\sthe\nvector\scomparison\slogic,\swhich\sin\sturn\srequired\schanging\sOP_ElseNotEq\sinto\nOP_ElseEq.
-D 2021-03-29T18:53:47.017
+C Fix\sVDBE\scoverage\smacros.
+D 2021-03-29T19:47:39.563
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -494,7 +494,7 @@ F src/date.c e0632f335952b32401482d099321bbf12716b29d6e72836b53ae49683ebae4bf
 F src/dbpage.c 8a01e865bf8bc6d7b1844b4314443a6436c07c3efe1d488ed89e81719047833a
 F src/dbstat.c 3aa79fc3aed7ce906e4ea6c10e85d657299e304f6049861fe300053ac57de36c
 F src/delete.c 73f57a9a183532c344a3135cf8f2a5589376e39183e0b5f562d6b61b2af0f4d8
-F src/expr.c a1403e4cf24866c72d106efec4964dab7e091ba41e74b45391de8feb9559e193
+F src/expr.c 1a63403c5b06f762efc74f88ba59ea1ff58c9897bc74b36561ac4e259083e61e
 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
 F src/fkey.c e9063648396c58778f77583a678342fe4a9bc82436bf23c5f9f444f2df0fdaa4
 F src/func.c 479f6929be027eb0210cbdde9d3529c012facf082d64a6b854a9415940761e5e
@@ -1911,7 +1911,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 93781b6f10a94fb273204b95156a8b90e07071f28c89e7966c659a0f44f60e98
-R ed7fa1a1687fff75bb9781a6223d037a
+P 380b46054b6a9b67e57357815e8e94057253fa3cce838ae76e5d5031c6bd26b2
+R 1674bcaa46be0ff1550b889637821f20
 U drh
-Z 76d5f50926fa29a440f23aff574c758c
+Z aa0d9c4feadd7b04fe0240161ce3963a

diff --git a/manifest.uuid b/manifest.uuid
index 11a1b4ff909f46816d23693f770135f5e1a50ea2..084e1e1c5fd050592bac880c611afb9769bbdbd1 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-380b46054b6a9b67e57357815e8e94057253fa3cce838ae76e5d5031c6bd26b2
\ No newline at end of file
+ebe100de55ccdf6abccde5d8e6e96099b6e8dc3527f1441265e2b86b6661a66b
\ No newline at end of file

diff --git a/src/expr.c b/src/expr.c
index 37d16fe40d8679bb8c930a03eb14a7c7fd39ec8d..a780fac112808d79137e3153f658d2b60069f77f 100644 (file)
--- a/src/expr.c
+++ b/src/expr.c
@@ -4068,17 +4068,17 @@ expr_code_doover:
         codeCompare(pParse, pLeft, pExpr->pRight, op, r1, r2,
             sqlite3VdbeCurrentAddr(v)+2, p5,
             ExprHasProperty(pExpr,EP_Commuted));
-        if( p5==SQLITE_NULLEQ ){
-          sqlite3VdbeAddOp2(v, OP_Integer, 0, inReg);
-        }else{
-          sqlite3VdbeAddOp3(v, OP_ZeroOrNull, r1, inReg, r2);
-        }
         assert(TK_LT==OP_Lt); testcase(op==OP_Lt); VdbeCoverageIf(v,op==OP_Lt);
         assert(TK_LE==OP_Le); testcase(op==OP_Le); VdbeCoverageIf(v,op==OP_Le);
         assert(TK_GT==OP_Gt); testcase(op==OP_Gt); VdbeCoverageIf(v,op==OP_Gt);
         assert(TK_GE==OP_Ge); testcase(op==OP_Ge); VdbeCoverageIf(v,op==OP_Ge);
         assert(TK_EQ==OP_Eq); testcase(op==OP_Eq); VdbeCoverageIf(v,op==OP_Eq);
         assert(TK_NE==OP_Ne); testcase(op==OP_Ne); VdbeCoverageIf(v,op==OP_Ne);
+        if( p5==SQLITE_NULLEQ ){
+          sqlite3VdbeAddOp2(v, OP_Integer, 0, inReg);
+        }else{
+          sqlite3VdbeAddOp3(v, OP_ZeroOrNull, r1, inReg, r2);
+        }
         testcase( regFree1==0 );
         testcase( regFree2==0 );
       }