Mark an always-true conditional with ALWAYS().

FossilOrigin-Name: 35a236841764a10cdcda63f34e1a8e7ffa43933bc89cb32f675454327834d7bf

diff --git a/manifest b/manifest
index cb430643e5acaf01e58937cd7f77b18c0fd49f25..f1c071e2ea9fe42721f8c5b9c4ef75a7425df80d 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Ensure\sthat\saggregate\sfunctions\sthat\s(a)\sare\spart\sof\sSELECT\sstatements\swith\sno\sFROM\sclause\sand\s(b)\shave\sone\sor\smore\sscalar\ssub-selects\sas\sarguments\sare\sassigned\sto\sthe\scorrect\saggregate\scontext.
-D 2020-06-09T17:45:48.153
+C Mark\san\salways-true\sconditional\swith\sALWAYS().
+D 2020-06-09T22:11:06.772
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -485,7 +485,7 @@ F src/date.c b29b349d277e3d579dcc295b24c0a2caed83fd8f090a9f7cbe6070c0fd662384
 F src/dbpage.c 8a01e865bf8bc6d7b1844b4314443a6436c07c3efe1d488ed89e81719047833a
 F src/dbstat.c 793deaf88a0904f88285d93d6713c636d55ede0ffd9f08d10f4ea825531d367f
 F src/delete.c 88047c8e59878c920fce14582bc1dde4d81157d1ca5ffdf36c2907e6d41996c4
-F src/expr.c a72ee44af014cade90746871e90f57a16f97ce5e5d1502e29a556490fd267a15
+F src/expr.c 54c0e48fdafb60c54efd786434a56eccbea7d887b7f84ed3568233de35ca81a8
 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
 F src/fkey.c 4b575423b0a5d4898b1a7868ce985cf1a8ad91c741c9abbb108ff02536d20f41
 F src/func.c 2333eb4277f55a5efdc12ef754e7d7ec9105d257b2fd00301d23ce1e8fa67dc0
@@ -1867,10 +1867,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 232431f32ef77a9dfc4eeb7765dca24af72051fd5460f648d0c5ba318c8a01fc
-R 0227801129ea01db7bd6b8fdef42c443
-T *branch * agg-context-fix
-T *sym-agg-context-fix *
-T -sym-trunk *
-U dan
-Z b0984ce04348fe30b8ef7dbc168a8647
+P 16a41fa8c4c74bba4e908a9c19e6cf5a927cac140e2070c9abf303158be7257b
+R c0708f727fdcc95b477a18221a965825
+U drh
+Z f79254b70a5e081e8abefb3c222e5de7

diff --git a/manifest.uuid b/manifest.uuid
index 0f7761b1d4900bea987250f05b010669e4bc21c1..9d6237b1f85d95721fd15ba0c6d8a1f93bc0003c 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-16a41fa8c4c74bba4e908a9c19e6cf5a927cac140e2070c9abf303158be7257b
\ No newline at end of file
+35a236841764a10cdcda63f34e1a8e7ffa43933bc89cb32f675454327834d7bf
\ No newline at end of file

diff --git a/src/expr.c b/src/expr.c
index 87dbe617ac69740e4de9fd3f1384563546cab13d..79d57454c98489b950f013f6cb5d1315056b756a 100644 (file)
--- a/src/expr.c
+++ b/src/expr.c
@@ -5667,7 +5667,7 @@ struct SrcCount {
 */
 static int selectSrcCount(Walker *pWalker, Select *pSel){
   struct SrcCount *p = pWalker->u.pSrcCount;
-  if( p->iSrcInner==0x7FFFFFFF && pSel->pSrc && pSel->pSrc->nSrc ){
+  if( p->iSrcInner==0x7FFFFFFF && ALWAYS(pSel->pSrc) && pSel->pSrc->nSrc ){
     pWalker->u.pSrcCount->iSrcInner = pSel->pSrc->a[0].iCursor;
   }
   return WRC_Continue;