Add an ALWAYS() on a branch in the new indexed-subtype logic.

FossilOrigin-Name: f150c3c5b898975b1f83d61fa589753449a48f8a0007e8e167dbd702528197c5

diff --git a/manifest b/manifest
index 90933ecb1306834b637904db2b371117ad5777d3..0d63b0cdd2d9f3bf7ccbb00b598f02c53f1f0e19 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sa\sNEVER()\sto\san\sunreachable\sbranch\sin\sthe\snew\sindexed-subtype\slogic.\nMark\sthe\spi()\sfunction\sas\sdeterministic.
-D 2024-10-07T21:04:57.392
+C Add\san\sALWAYS()\son\sa\sbranch\sin\sthe\snew\sindexed-subtype\slogic.
+D 2024-10-08T00:15:22.623
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -719,7 +719,7 @@ F src/date.c 89ce1ff20512a7fa5070ba6e7dd5c171148ca7d580955795bf97c79c2456144a
 F src/dbpage.c db1be8adaf1f839ad733c08baeac5c22aa912f7b535865c0c061382602081360
 F src/dbstat.c 73362c0df0f40ad5523a6f5501224959d0976757b511299bf892313e79d14f5c
 F src/delete.c 03a77ba20e54f0f42ebd8eddf15411ed6bdb06a2c472ac4b6b336521bf7cea42
-F src/expr.c 6800ecb6c48d9ab0b73e5b25dd1f6176fe4ffae89de2edfb9604e290ae5c7be4
+F src/expr.c a9d9f5fdfbdd3b2c94d7af1b11f181464b8a641736cf32cb92fa3c5e7ecb30df
 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
 F src/fkey.c 928ed2517e8732113d2b9821aa37af639688d752f4ea9ac6e0e393d713eeb76f
 F src/func.c 1d093b93b8f097665721e59a1c404d7db4dc591e1a777a7a1022dfbda21e108b
@@ -2216,8 +2216,8 @@ F vsixtest/vsixtest.tcl 6195aba1f12a5e10efc2b8c0009532167be5e301abe5b31385638080
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P c361dd91841da64fdd009e6eab389ccd81266a24d1070e5313fe1d22e6cef65a
-R 4fa3cedbad7dc576720ba11e0ac36827
+P 50be8f5091b2202b67a80f826feee2c378f001745ad5acb7c4374423bbf6ff22
+R 4f5fad7a5b3f0800af84dc5d2cb9639f
 U drh
-Z ff784421601a4233097df0f7c86caf61
+Z c1cd4067e85475803952865dab33ef60
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index dcd3d5cf34f320476eadf7d36336c20024cc029a..57a56b0df11518f4fef0ecfe005058ae94803b1d 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-50be8f5091b2202b67a80f826feee2c378f001745ad5acb7c4374423bbf6ff22
+f150c3c5b898975b1f83d61fa589753449a48f8a0007e8e167dbd702528197c5

diff --git a/src/expr.c b/src/expr.c
index 4404f30c165a995e1fa5ab4e5dd432c1a238b9d7..cc915987ddb30dd90da79950f161416400d0e8ad 100644 (file)
--- a/src/expr.c
+++ b/src/expr.c
@@ -4580,7 +4580,7 @@ static int exprNodeCanReturnSubtype(Walker *pWalker, Expr *pExpr){
   }
   assert( ExprUseXList(pExpr) );
   db = pWalker->pParse->db;
-  n = pExpr->x.pList ? pExpr->x.pList->nExpr : 0;
+  n = ALWAYS(pExpr->x.pList) ? pExpr->x.pList->nExpr : 0;
   pDef = sqlite3FindFunction(db, pExpr->u.zToken, n, ENC(db), 0);
   if( NEVER(pDef==0) || (pDef->funcFlags & SQLITE_RESULT_SUBTYPE)!=0 ){
     pWalker->eCode = 1;