Add NEVER() to a branch made unreachable by [6f9eed826f5b3d1c].

FossilOrigin-Name: 26dcaa34e3521783bde687749d590eca54cecb4bb95ef332a4a6473c4141d052

diff --git a/manifest b/manifest
index c3cb199a168bbab73940a555079a62f106f4f0e6..47ead2b316daa2d08a7e4392a89a4a4a48678124 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C JNI:\sreimplement\sTester2.execSql()\susing\sthe\shigh-level\sAPI.
-D 2023-11-14T14:59:41.697
+C Add\sNEVER()\sto\sa\sbranch\smade\sunreachable\sby\s[6f9eed826f5b3d1c].
+D 2023-11-14T16:53:52.014
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -674,7 +674,7 @@ F src/date.c 3b8d02977d160e128469de38493b4085f7c5cf4073193459909a6af3cf6d7c91
 F src/dbpage.c 80e46e1df623ec40486da7a5086cb723b0275a6e2a7b01d9f9b5da0f04ba2782
 F src/dbstat.c 3b677254d512fcafd4d0b341bf267b38b235ccfddbef24f9154e19360fa22e43
 F src/delete.c cb766727c78e715f9fb7ec8a7d03658ed2a3016343ca687acfcec9083cdca500
-F src/expr.c f8bbcfb98887c1de69de85f3dbc18c2bfabdc8e551d96bc798dff5472fca4341
+F src/expr.c 88629faed0b576b7ffa3d82ce44cbcee4ed476a2bf1ea4e1d6bf1260e03b19cb
 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
 F src/fkey.c a47610f0a5c6cb0ad79f8fcef039c01833dec0c751bb695f28dc0ec6a4c3ba00
 F src/func.c 472f6dcfa39cf54f89a6aec76c79c225fb880a6c14469c15d361331662b9bf43
@@ -2139,8 +2139,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 6f9eed826f5b3d1cb08402925b406a7fe9b54259af1ba5eba92d4d37fbad628a
-R feb9a566cf38692cf88b194dedd844a6
-U stephan
-Z 3ab4c39a2f231e26a5c50b57bdfcf5f5
+P 3a69679e41d23a760df349b2471a1ed306c087f9a7a7a2e2cba3723071dee6b2
+R 86e45bec612b162e274e644f32063331
+U drh
+Z b640c146c438183b53719e4f6331aea5
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 25e87b27f5cf4d0e6b365d61e6f78dfe6dce88ed..6997f19a6af3fff769d2fc2ba1c56c3b87a41427 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-3a69679e41d23a760df349b2471a1ed306c087f9a7a7a2e2cba3723071dee6b2
\ No newline at end of file
+26dcaa34e3521783bde687749d590eca54cecb4bb95ef332a4a6473c4141d052
\ No newline at end of file

diff --git a/src/expr.c b/src/expr.c
index 04e37e26d9515de7da057a440c3658f76978e899..f9234734d5ee2086d1d99ce3bd2642c79907a38f 100644 (file)
--- a/src/expr.c
+++ b/src/expr.c
@@ -6776,7 +6776,7 @@ static int analyzeAggregate(Walker *pWalker, Expr *pExpr){
         */
         struct AggInfo_func *pItem = pAggInfo->aFunc;
         for(i=0; i<pAggInfo->nFunc; i++, pItem++){
-          if( pItem->pFExpr==pExpr ) break;
+          if( NEVER(pItem->pFExpr==pExpr) ) break;
           if( sqlite3ExprCompare(0, pItem->pFExpr, pExpr, -1)==0 ){
             break;
           }