From: drh <drh@noemail.net>
Date: Mon, 13 Jul 2020 15:35:08 +0000 (+0000)
Subject: Readd the ALWAYS() macro that was removed by [f7a74f89dbd58b47] as the
X-Git-Tag: version-3.33.0~60
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5b107654e965973e68c88f90a09a3cc53bac9d8b;p=thirdparty%2Fsqlite.git

Readd the ALWAYS() macro that was removed by [f7a74f89dbd58b47] as the
condition is no longer reachable due to the previous check-in.

FossilOrigin-Name: 9cb03beae42d814a1b1b69f72865fde502d3f443313ec29edd010d1de40225eb
---

diff --git a/manifest b/manifest
index a1b6958070..c182bbb7ca 100644
--- a/manifest
+++ b/manifest
@@ -1,6 +1,6 @@
 B 7a876209a678a34c198b54ceef9e3c041f128a14dc73357f6a57cadadaa6cf7b
-C Fix\sa\sproblem\scausing\squeries\scontaining\swindow\sfunctions\sto\signore\scollation\ssequences\sunder\ssome\scircumstances.
-D 2020-07-13T15:20:27.736
+C Readd\sthe\sALWAYS()\smacro\sthat\swas\sremoved\sby\s[f7a74f89dbd58b47]\sas\sthe\ncondition\sis\sno\slonger\sreachable\sdue\sto\sthe\sprevious\scheck-in.
+D 2020-07-13T15:35:08.219
 F Makefile.in 19374a5db06c3199ec1bab71ab74a103d8abf21053c05e9389255dc58083f806
 F Makefile.msc 48f5a3fc32672c09ad73795749f6253e406a31526935fbbffd8f021108d54574
 F autoconf/Makefile.am a8d1d24affe52ebf8d7ddcf91aa973fa0316618ab95bb68c87cabf8faf527dc8
@@ -18,7 +18,7 @@ F main.mk b1cd0bc6aedad7ebb667b7f74f835f932f60ee33be2a5c3051fd93eb465f5c75
 F src/btree.c e8a64df5ebd1e9d5184ff89fc110e048cdf7b77cc300eb51c48969ef4e71c23b
 F src/btreeInt.h 19267385aa3bc00067d48e0e4ba83ae82dc08b0c15a3b3df20ea653cb462b5bf
 F src/build.c ba1bbe563a3dc02d5fed20537603181e5289c13ea30ae5e775f552e7557adbfa
-F src/expr.c 73bd71448acb4f9a69c8c05e30281a9e982bb7de8f91a9c93b742dec09280442
+F src/expr.c 90039a043658ce78c3237ba5064c0934b7294120f6adc387f8d0fba306028154
 F src/parse.y b6b4b02f8cc8f94ac1d93a922543e0344dbb30b04877898736c01ec7ec03eaaa
 F src/pragma.c ae499b5ab8f4e833f67e28bf2322500e9aa612aadf12581d1324333f848d8b51
 F src/pragma.h 8dc78ab7e9ec6ce3ded8332810a2066f1ef6267e2e03cd7356ee00276125c6cf
@@ -51,7 +51,7 @@ F tool/mksqlite3c.tcl f4ef476510eca4124c874a72029f1e01bc54a896b1724e8f9eef0d8bfa
 F tool/mksqlite3h.tcl 1f5e4a1dbbbc43c83cc6e74fe32c6c620502240b66c7c0f33a51378e78fc4edf
 F tool/showlocks.c 9cc5e66d4ebbf2d194f39db2527ece92077e86ae627ddd233ee48e16e8142564
 F tool/speed-check.sh 615cbdf50f1409ef3bbf9f682e396df80f49d97ed93ed3e61c8e91fae6afde58
-P 49da8bdce17ced910b414d50e8df79800513dcf03a196197dc1ea8e47deeda92
-R 18df21e3eeb9dc795d1a995e52f5b385
-U dan
-Z 7954a7e23c93e850aa318d75407d6e75
+P e6c2192ef88e9990c8b91755c8e779f09e23f936a17123d8e42059257b756ed7
+R 6bb073a35e650c3614329dfe9addd72f
+U drh
+Z 0642ca58347e016bdf51c35b901ea5bc
diff --git a/manifest.uuid b/manifest.uuid
index f49c48a4a6..880efef3d2 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e6c2192ef88e9990c8b91755c8e779f09e23f936a17123d8e42059257b756ed7
\ No newline at end of file
+9cb03beae42d814a1b1b69f72865fde502d3f443313ec29edd010d1de40225eb
\ No newline at end of file
diff --git a/src/expr.c b/src/expr.c
index d569637366..abc4b12cf6 100644
--- a/src/expr.c
+++ b/src/expr.c
@@ -198,7 +198,7 @@ CollSeq *sqlite3ExprCollSeq(Parse *pParse, const Expr *pExpr){
          && ALWAYS(!ExprHasProperty(p, EP_xIsSelect))
         ){
           int i;
-          for(i=0; i<p->x.pList->nExpr; i++){
+          for(i=0; ALWAYS(i<p->x.pList->nExpr); i++){
             if( ExprHasProperty(p->x.pList->a[i].pExpr, EP_Collate) ){
               pNext = p->x.pList->a[i].pExpr;
               break;