Add an ALWAYS() around a new branch that was made unreachable by an even

newer change.

FossilOrigin-Name: 592c010478fba7410424f011a62e019c826f1ac3

diff --git a/manifest b/manifest
index 340322d8fae7be59800100a1d6a14fed9bf89d06..98ea026575cdbe1a68106bb2077ad08a8ab4bb35 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\san\soff-by-one\sassert()\sin\sthe\svirtual\stable\sargument\stokenizer.
-D 2015-04-19T23:11:10.399
+C Add\san\sALWAYS()\saround\sa\snew\sbranch\sthat\swas\smade\sunreachable\sby\san\seven\nnewer\schange.
+D 2015-04-20T01:13:33.830
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in faaf75b89840659d74501bea269c7e33414761c1
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -182,7 +182,7 @@ F src/complete.c a5cf5b4b56390cfb7b8636e8f7ddef90258dd575
 F src/ctime.c 98f89724adc891a1a4c655bee04e33e716e05887
 F src/date.c e4d50b3283696836ec1036b695ead9a19e37a5ac
 F src/delete.c 37964e6c1d73ff49cbea9ff690c9605fb15f600e
-F src/expr.c 25a732f30ba391dfb00bbdc9ec079056c2fbced5
+F src/expr.c 5555f768c05d7d4a7840c6c2e72ad7aecbe0fe54
 F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
 F src/fkey.c 3343d551a8d810782257244fb33f2ce191493c39
 F src/func.c 1414c24c873c48796ad45942257a179a423ba42f
@@ -1251,7 +1251,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P e73ac0cbac257d2d2b28e51423e30d7449b6c7b5
-R 70d28450bd13a75aeed954614a2f2b46
+P c83052e48bbae0f45db2a44155b4e5482ee4a901
+R 952a9e0aae8c56d03933920a47e90909
 U drh
-Z 2b960b7774bbbdaf4d5bf53bdfe32951
+Z b000b63de0ad5ddbe40a2bc087fe2878

diff --git a/manifest.uuid b/manifest.uuid
index a3ebe5f013f468843f9f3746cbbe33e615ed1a35..0e878dee1e1b21660b3d8b661e90fe0127104c41 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c83052e48bbae0f45db2a44155b4e5482ee4a901
\ No newline at end of file
+592c010478fba7410424f011a62e019c826f1ac3
\ No newline at end of file

diff --git a/src/expr.c b/src/expr.c
index 660fbff7b6ebd85a371250b1414672408c79509e..3f8bd942efa8a67976c4bd1a53d9053abf75c2c7 100644 (file)
--- a/src/expr.c
+++ b/src/expr.c
@@ -1252,7 +1252,7 @@ u32 sqlite3ExprListFlags(const ExprList *pList){
   if( pList ){
     for(i=0; i<pList->nExpr; i++){
        Expr *pExpr = pList->a[i].pExpr;
-       if( pExpr ) m |= pList->a[i].pExpr->flags;
+       if( ALWAYS(pExpr) ) m |= pList->a[i].pExpr->flags;
     }
   }
   return m;