ALWAYS() and NEVER() macros added due to unreachable branches arising

from the previous check-in.

FossilOrigin-Name: 13ffedab9bd22c6e5a3fd54dd44a7a3e6d5375f1a14fed67638c541c0edc51dd

diff --git a/manifest b/manifest
index 7e12f2a5e827d37bb9a50dc36cafa04d4bf78940..cfd33862b50003fb7211bcbf6c217cbdf3b3c288 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Move\sthe\sparse\stree\srewrite\sfor\swindow\sfunctions\searlier\sin\sthe\sprocess,\nbefore\ssqlite3ExprAnalyzeAggregates()\shas\srun.\s\sAdd\snew\sassert()s\sto\sverify\nthat\saggregate\sanalysis\salways\sremains\svalid\suntil\sthe\send\sof\sSELECT\nprocessing.
-D 2020-06-05T14:10:23.063
+C ALWAYS()\sand\sNEVER()\smacros\sadded\sdue\sto\sunreachable\sbranches\sarising\nfrom\sthe\sprevious\scheck-in.
+D 2020-06-05T14:25:45.202
 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 ab412878f35cd561aa42fd8022fbf87654fe4181c9a1b14a8abb1018a9253349
+F src/expr.c 2c5582c50443b689dbd94644e7d12257ba0d8c73da4f9ad384906b320ab2ae90
 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
 F src/fkey.c 4b575423b0a5d4898b1a7868ce985cf1a8ad91c741c9abbb108ff02536d20f41
 F src/func.c 2333eb4277f55a5efdc12ef754e7d7ec9105d257b2fd00301d23ce1e8fa67dc0
@@ -531,9 +531,9 @@ F src/pragma.h 8168e588536bffd95319451f34e9a754dc37d205ebe433031a7813c5b286beae
 F src/prepare.c aeb3ba661e2666dab15c4b5c55f6eb816f01d20e35fa860bb807e4a3b36e1e27
 F src/printf.c 94b5419ad0a17269f76a9e968ca19cf9fa37617abed2e246fc48844e511b6bc6
 F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
-F src/resolve.c ab7add324c929f6192cecb3ca8090520200b505b7eb3e8accb8a73d41c4e4a6e
+F src/resolve.c 66f149f309e67d6563374e284bb8439057cb970e47f23058d9e5270208d274be
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
-F src/select.c 1204f18a116dbb8058a2f2d9e5930011b3e56ddf3f896cb1d0b3c52dd3adde1a
+F src/select.c cff4a9aee848364a20da60b109d502bdd8c672592e992c3f29d7294c93644fef
 F src/shell.c.in c6e26593f2738eefded08a39204bf6b48db135cdfaa458c26ffe57055b4fe365
 F src/sqlite.h.in 74342b41e9d68ff9e56b192009046f8dd0aa2bd76ce1a588f330de614ba61de7
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
@@ -1866,10 +1866,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 c1c8937a30feff6aa4385b0c264fd8e70d54422a0629c2ce38082d85d3334a57
-R ed5f5dced79cdaba8115cb0cef493592
-T *branch * early-winfunc-rewrite
-T *sym-early-winfunc-rewrite *
-T -sym-trunk *
+P fe702aa08c3b93a5ea6cb383ff6794c841d96eac4ce324e1ecc14dcb624c5be6
+R dd053666ad4838eac658726d2f00e3a5
 U drh
-Z 5123be131a9e9f976e9dd48d4565f135
+Z 901a189c70ecdc1ad624e241feb675d9

diff --git a/manifest.uuid b/manifest.uuid
index a8cdf8b1a584ba8c39851a153023475d49492a2c..cf7d27b44a755c13f5d0c2ef693b257dc85a7d81 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-fe702aa08c3b93a5ea6cb383ff6794c841d96eac4ce324e1ecc14dcb624c5be6
\ No newline at end of file
+13ffedab9bd22c6e5a3fd54dd44a7a3e6d5375f1a14fed67638c541c0edc51dd
\ No newline at end of file

diff --git a/src/expr.c b/src/expr.c
index 414558bd87411513e06f93624e877e52fd6d8952..b5c8ca571e463612d02fc7e4391770584c722e4b 100644 (file)
--- a/src/expr.c
+++ b/src/expr.c
@@ -5659,13 +5659,7 @@ struct SrcCount {
 ** Count the number of references to columns.
 */
 static int exprSrcCount(Walker *pWalker, Expr *pExpr){
-  /* There was once a NEVER() on the second term on the grounds that
-  ** sqlite3FunctionUsesThisSrc() was always called before 
-  ** sqlite3ExprAnalyzeAggregates() and so the TK_COLUMNs have not yet 
-  ** been converted into TK_AGG_COLUMN. But this is no longer true due
-  ** to window functions - sqlite3WindowRewrite() may now indirectly call
-  ** FunctionUsesThisSrc() when creating a new sub-select. */
-  if( pExpr->op==TK_COLUMN || pExpr->op==TK_AGG_COLUMN ){
+  if( pExpr->op==TK_COLUMN || NEVER(pExpr->op==TK_AGG_COLUMN) ){
     int i;
     struct SrcCount *p = pWalker->u.pSrcCount;
     SrcList *pSrc = p->pSrc;

diff --git a/src/resolve.c b/src/resolve.c
index f5e68ab524da77dfc2d44eb0eb25eed665709fbd..ff2df9f624d27fa8a168875641a12ab0c427abf9 100644 (file)
--- a/src/resolve.c
+++ b/src/resolve.c
@@ -1715,7 +1715,7 @@ static int resolveSelectStep(Walker *pWalker, Select *p){
           return WRC_Abort;
         }
       }
-    }else if( p->pWin && (p->selFlags & SF_WinRewrite)==0 ){
+    }else if( p->pWin && ALWAYS( (p->selFlags & SF_WinRewrite)==0 ) ){
       sqlite3WindowRewrite(pParse, p);
 #if SELECTTRACE_ENABLED
       if( (sqlite3SelectTrace & 0x108)!=0 ){

diff --git a/src/select.c b/src/select.c
index 747ed1ea11f9ec8823acd6f7c60ff8f4a2999ab1..c7ce89b09998a786816c020ba414a0e8961d9ccd 100644 (file)
--- a/src/select.c
+++ b/src/select.c
@@ -6119,7 +6119,7 @@ int sqlite3Select(
   if( (p->selFlags & (SF_Distinct|SF_Aggregate))==SF_Distinct 
    && sqlite3ExprListCompare(sSort.pOrderBy, pEList, -1)==0
 #ifndef SQLITE_OMIT_WINDOWFUNC
-   && p->pWin==0
+   && ALWAYS(p->pWin==0)
 #endif
   ){
     p->selFlags &= ~SF_Distinct;