Add ALWAYS() to branches that are no longer reachable due to recent

enhancements.

FossilOrigin-Name: 63c50fbdeed831ba450d1dce67e968a7daa2b69ac1270eb271fb1e1873d4a07e

diff --git a/manifest b/manifest
index c3610b67dc8076d79060b8da6c86881c82327fee..96a18f995095a43105abec6db65ca43c0179ed6c 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C refix\saltertab.test
-D 2021-04-26T20:18:08.281
+C Add\sALWAYS()\sto\sbranches\sthat\sare\sno\slonger\sreachable\sdue\sto\srecent\nenhancements.
+D 2021-04-26T21:00:51.168
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -495,7 +495,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 01ae116c42159f5a7383d9fa30aa04ad8929a244439237aafbdfa105d989700f
+F src/expr.c 70e2cf6e270bb97ab6602336c82060bee0720cd887483f85c645ac1df97d4a34
 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
 F src/fkey.c e9063648396c58778f77583a678342fe4a9bc82436bf23c5f9f444f2df0fdaa4
 F src/func.c 88fd711754a7241cb9f8eb1391370fd0c0cea756b3358efa274c5d1efd59af93
@@ -541,7 +541,7 @@ F src/pragma.h 8dc78ab7e9ec6ce3ded8332810a2066f1ef6267e2e03cd7356ee00276125c6cf
 F src/prepare.c d778af9986f3b0107c5b255dcfe2696e8e99e00fb77c5115bbfea4e92c3302e7
 F src/printf.c 78fabb49b9ac9a12dd1c89d744abdc9b67fd3205e62967e158f78b965a29ec4b
 F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
-F src/resolve.c 91d9763a72dae4d3355e281430144196c5e449e9de71cb7e40cc6d72d16fd8bc
+F src/resolve.c c38bbb89d7ba7a8673ec4f59b63e0980eb859c39ff2acc5df8b3d0f2dcd33115
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
 F src/select.c bc08a79364ad2056b1b3b83142b1cc4eacabf850603166f3a72581d56c320d9c
 F src/shell.c.in 9320b476fde0f7c46700e5695b69b435f1e46843a1513cdd187ac426cdbee016
@@ -1914,7 +1914,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 6c6334660dfe81cc33a14b87b25d748b1c98b0702b7bc6db2e3ced16dc992740
-R ba22c3c4a5936f02c9f9a04f2d00726e
-U larrybr
-Z 772b7b8a90d9d4ffae7545c81ee9f9c9
+P db032156932fb0dcae5ffb7cbdfb711079daa595713fcb254f09f8ef90c81d95
+R ffed239cd8e8956a4bed4ffe71f5ac2a
+U drh
+Z 5f325b4c5576cc7e02232be8d2acb561

diff --git a/manifest.uuid b/manifest.uuid
index d5946f8155906141b848ec28d758fec6ea3c9415..cb8994e4d3d688d64bf9a95a79fc02d03fa55ea8 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-db032156932fb0dcae5ffb7cbdfb711079daa595713fcb254f09f8ef90c81d95
\ No newline at end of file
+63c50fbdeed831ba450d1dce67e968a7daa2b69ac1270eb271fb1e1873d4a07e
\ No newline at end of file

diff --git a/src/expr.c b/src/expr.c
index c869d762fb7347e2ca8968a68bf579540bd6ade5..14026093113b5707edd695d80e812953a283871f 100644 (file)
--- a/src/expr.c
+++ b/src/expr.c
@@ -99,7 +99,7 @@ Expr *sqlite3ExprAddCollateToken(
   if( pExpr==0 ) return 0;
   if( pExpr->op==TK_VECTOR ){
     ExprList *pList = pExpr->x.pList;
-    if( pList!=0 ){
+    if( ALWAYS(pList!=0) ){
       int i;
       for(i=0; i<pList->nExpr; i++){
         pList->a[i].pExpr = sqlite3ExprAddCollateToken(pParse,pList->a[i].pExpr,

diff --git a/src/resolve.c b/src/resolve.c
index 242aca1aedc2b15cd0174546d2a31bf1fea8392f..4f5c5b96146206a151aecbcac3f3565c1c73493b 100644 (file)
--- a/src/resolve.c
+++ b/src/resolve.c
@@ -106,10 +106,8 @@ static void resolveAlias(
       pExpr->flags |= EP_MemToken;
     }
     if( ExprHasProperty(pExpr, EP_WinFunc) ){
-      if( pExpr->y.pWin!=0 ){
+      if( ALWAYS(pExpr->y.pWin!=0) ){
         pExpr->y.pWin->pOwner = pExpr;
-      }else{
-        assert( db->mallocFailed );
       }
     }
     sqlite3DbFree(db, pDup);