Add a NEVER() on an unreachable branch.

FossilOrigin-Name: 388926254b9da6169da7267bd4d5a1a66a26576be435c88269ab8db9eaedc079

diff --git a/manifest b/manifest
index 5ac5027c9a4ed3e441348bf6c518175dbd6bc418..ac1e0268cc0c2ba0b601a9a64f2b7ddda4f62635 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Include\shidden\scolumns\sof\stable\svalued\sfunctions\sthat\sare\sconstrained\nby\sthe\sfunction\sarguments\sin\sthe\scolUsed\sbitmask.
-D 2022-01-28T19:53:37.840
+C Add\sa\sNEVER()\son\san\sunreachable\sbranch.
+D 2022-01-28T23:19:01.285
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -642,7 +642,7 @@ F src/walker.c f890a3298418d7cba3b69b8803594fdc484ea241206a8dfa99db6dd36f8cbb3b
 F src/where.c f61ca6dbb4bbb7171aa5f5459982d8d98aac24852572bcee250f9c469a1963ba
 F src/whereInt.h 0748a6fce98b41862445906922a809146ff7ef4de16ed9022b0bc4e5c43aa60a
 F src/wherecode.c c313ccf5ed13dc7e88c64f93733f414dee369a212508a866878696d83c64fc36
-F src/whereexpr.c 42195849443c3648fa9900c82837b7592c91bd43934ad9369d30f5d55d7fe19e
+F src/whereexpr.c becee225f104abd0253e0ceecd2a6253589f269395d98fc3ff98fdd64fecb34c
 F src/window.c dfaec4abc6012cbc18e4a202ca3a5d5a0efcc4011d86a06d882ddaab8aedee4d
 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 F test/affinity2.test ce1aafc86e110685b324e9a763eab4f2a73f737842ec3b687bd965867de90627
@@ -1942,8 +1942,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P c4c30df7cd858315359bd9bfa90a07152d87a2301eaec865c5bc1c65e272eec8
-R b21847307144bd6983c5bb4141c2b106
+P 8f8cab0d0e219f0c4bc2b8061c0013d90a2a5e598dd6cf420d302dfd1b7cbe11
+R 2886f1ce9cf06aa83d320b384893e940
 U drh
-Z c180a25bc067b4731882777cea55422e
+Z 20c096da0533f9910b77ed2d57db0dcc
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 1fe4679adef1e5ef61154bafa0450675e35bdc05..ae1add637cd830a468dc8508f4b9f71ae3631b3f 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-8f8cab0d0e219f0c4bc2b8061c0013d90a2a5e598dd6cf420d302dfd1b7cbe11
\ No newline at end of file
+388926254b9da6169da7267bd4d5a1a66a26576be435c88269ab8db9eaedc079
\ No newline at end of file

diff --git a/src/whereexpr.c b/src/whereexpr.c
index e4ddf493287af9a95d779017e7c76918ccf7afdc..45e0ea007c6cb476b3308f02c857e847e7208cd5 100644 (file)
--- a/src/whereexpr.c
+++ b/src/whereexpr.c
@@ -1615,7 +1615,8 @@ void sqlite3WhereAddLimit(WhereClause *pWC, Select *p){
     if( pOrderBy ){
       for(ii=0; ii<pOrderBy->nExpr; ii++){
         Expr *pExpr = pOrderBy->a[ii].pExpr;
-        if( pExpr->op!=TK_COLUMN || pExpr->iTable!=iCsr ) return;
+        if( pExpr->op!=TK_COLUMN ) return;
+        if( NEVER(pExpr->iTable!=iCsr) ) return;
         if( pOrderBy->a[ii].sortFlags & KEYINFO_ORDER_BIGNULL ) return;
       }
     }