Fix two assert() statements that failed to take into account

the likely() built-in function.  This does not impact production code.

FossilOrigin-Name: 634fe4c2386d42fac8bc6c4633ea95e8af61c1b0e8bf11a89b49d8dcbcfeee31

diff --git a/manifest b/manifest
index 515248a699f366ea6b339425952596510c273121..6c42ac2921bb351dbb8acc4bd61faff89f5c6491 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Version\s3.42.0
-D 2023-05-16T12:36:15.536
+C Fix\stwo\sassert()\sstatements\sthat\sfailed\sto\stake\sinto\saccount\nthe\slikely()\sbuilt-in\sfunction.\s\sThis\sdoes\snot\simpact\sproduction\scode.
+D 2023-05-17T00:29:46.154
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -586,7 +586,7 @@ F src/date.c aca9e0c08b400b21238b609aea7c09585396cd770985cf8f475560f69222dad3
 F src/dbpage.c f3eea5f7ec47e09ee7da40f42b25092ecbe961fc59566b8e5f705f34335b2387
 F src/dbstat.c ec92074baa61d883de58c945162d9e666c13cd7cf3a23bc38b4d1c4d0b2c2bef
 F src/delete.c a9c6d3f51c0a31e9b831e0a0580a98d702904b42d216fee530940e40dec34873
-F src/expr.c 941fe758212c6cf0007c6d7daf5368e11c199376ace9b3018494296e18a27eac
+F src/expr.c 6d9805e35595304bf996c509d00fe4e9f316479e9d78bc93d3aa3dbfbcbf43de
 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
 F src/fkey.c 03c134cc8bffe54835f742ddea0b72ebfc8f6b32773d175c71b8afeea6cb5c83
 F src/func.c 03e6b501f3056d0ba398bda17df938b2b566aa0b3ca7e1942a3cd1925d04ec36
@@ -699,7 +699,7 @@ F src/test_window.c cdae419fdcea5bad6dcd9368c685abdad6deb59e9fc8b84b153de513d394
 F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
 F src/threads.c 4ae07fa022a3dc7c5beb373cf744a85d3c5c6c3c
 F src/tokenize.c 1305797eab3542a0896b552c6e7669c972c1468e11e92b370533c1f37a37082b
-F src/treeview.c fccf3b8c517c1f55cb380c1522febe6921fcb2bd800c16c78cab571d0eb0ccbd
+F src/treeview.c 1d52fbc4e97161e65858d36e3424ea6e3fc045dd8a679c82b4b9593dc30de3bd
 F src/trigger.c ad6ab9452715fa9a8075442e15196022275b414b9141b566af8cdb7a1605f2b0
 F src/update.c 3f4fb5ad7c9b48d7911974d6579192bb3a6c27f46140b6cbb9139cc8a77b8691
 F src/upsert.c 5303dc6c518fa7d4b280ec65170f465c7a70b7ac2b22491598f6d0b4875b3145
@@ -2070,10 +2070,12 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 4254f086419892634c80b0b915e14edea365adc6a45bcc75eecba889da274ac3
-R 5363a07f3e1462ec2f4570a33edb7167
-T +sym-release *
-T +sym-version-3.42.0 *
+P 831d0fb2836b71c9bc51067c49fee4b8f18047814f2ff22d817d25195cf350b0
+Q +8504fe812c5b4956c8acad515d537add54cb591bc81747113f9b24526d7685b8
+R 358f1691fbed8672d93b79f8cd208404
+T *branch * branch-3.42
+T *sym-branch-3.42 *
+T -sym-trunk *
 U drh
-Z 0ee8e0816fa6ac728bed7565aed4ec35
+Z 677621f452bdeefd8f4ecd490de815e0
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 8d5c8bc91bb5ba5d95ed18351be744a5dcefdd78..7ee919089d9c747eb8ed714b606d66345efde4ee 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-831d0fb2836b71c9bc51067c49fee4b8f18047814f2ff22d817d25195cf350b0
\ No newline at end of file
+634fe4c2386d42fac8bc6c4633ea95e8af61c1b0e8bf11a89b49d8dcbcfeee31
\ No newline at end of file

diff --git a/src/expr.c b/src/expr.c
index a81b4595bb8e456673dd038bfd3f9c66394bb9c8..c6bc847ab60e2f179ee862b3f2274ada46571415 100644 (file)
--- a/src/expr.c
+++ b/src/expr.c
@@ -2191,7 +2191,7 @@ int sqlite3ExprIdToTrueFalse(Expr *pExpr){
 ** and 0 if it is FALSE.
 */
 int sqlite3ExprTruthValue(const Expr *pExpr){
-  pExpr = sqlite3ExprSkipCollate((Expr*)pExpr);
+  pExpr = sqlite3ExprSkipCollateAndLikely((Expr*)pExpr);
   assert( pExpr->op==TK_TRUEFALSE );
   assert( !ExprHasProperty(pExpr, EP_IntValue) );
   assert( sqlite3StrICmp(pExpr->u.zToken,"true")==0

diff --git a/src/treeview.c b/src/treeview.c
index 9f630b1561d97ed6b487c35ff20ba785c46dcafc..d55adab384d5ac916daa24ae1834f5f92c1fb07c 100644 (file)
--- a/src/treeview.c
+++ b/src/treeview.c
@@ -643,7 +643,8 @@ void sqlite3TreeViewExpr(TreeView *pView, const Expr *pExpr, u8 moreToFollow){
       };
       assert( pExpr->op2==TK_IS || pExpr->op2==TK_ISNOT );
       assert( pExpr->pRight );
-      assert( sqlite3ExprSkipCollate(pExpr->pRight)->op==TK_TRUEFALSE );
+      assert( sqlite3ExprSkipCollateAndLikely(pExpr->pRight)->op
+                  == TK_TRUEFALSE );
       x = (pExpr->op2==TK_ISNOT)*2 + sqlite3ExprTruthValue(pExpr->pRight);
       zUniOp = azOp[x];
       break;