Add ALWAYS() around a conditional that is always true.

FossilOrigin-Name: 270e17bba1d35f8c300844e75b2aa15f79a1ab62e40bc5e6bc9694902f8f7dde

diff --git a/manifest b/manifest
index fe1a11580ce035324539acf8421a163e89f870e2..502d27013f1512e44f7fc20d2546a003fbc595e0 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,6 +1,6 @@
 B 7a876209a678a34c198b54ceef9e3c041f128a14dc73357f6a57cadadaa6cf7b
-C Use\s#ifdef\sto\somit\scode\sthat\sis\sonly\sreachable\swhen\sthe\nSQLITE_ENABLE_UPDATE_DELETE_LIMIT\scompile-time\soption\sis\sused.
-D 2020-07-17T18:07:36.516
+C Add\sALWAYS()\saround\sa\sconditional\sthat\sis\salways\strue.
+D 2020-07-17T22:20:23.013
 F Makefile.in 19374a5db06c3199ec1bab71ab74a103d8abf21053c05e9389255dc58083f806
 F Makefile.msc 48f5a3fc32672c09ad73795749f6253e406a31526935fbbffd8f021108d54574
 F autoconf/Makefile.am a8d1d24affe52ebf8d7ddcf91aa973fa0316618ab95bb68c87cabf8faf527dc8
@@ -33,7 +33,7 @@ F src/sqliteInt.h 9682c3ce6b970b3a997d65c140bdb5b286a04188e4e1c8489b64a525161ecb
 F src/test1.c fe56c4bcaa2685ca9aa25d817a0ee9345e189aff4a5a71a3d8ba946c7776feb8
 F src/test_malloc.c 21121ea85b49ec0bdb69995847cef9036ef9beca3ce63bbb776e4ea2ecc44b97
 F src/trigger.c ef67bde309a831515dc3c2173d792574309f2f42d45f8c078743fae9f7f98c75
-F src/update.c a3b2d50dc23e57c01054741cd09c1564cf5dd7df68b07d2d2b14e0c86cd12ad7
+F src/update.c e917882ce2a8529ab361500b62ff6d3f0839b946f696d2ec3b048774ff11e37f
 F src/util.c c0bacc165f46169d2b720c37c8719165e383211698fad1de39dd16a8c161815a
 F src/vdbe.c 981666c49d33039df6dc9fccd40191575586ac4866255b2f57819cc5eb99f572
 F src/vdbeapi.c c1a9004ac554d8d48794d2ce5f80397f8e419fd28643a543cc1e004c7713c3ef
@@ -68,7 +68,7 @@ F tool/mksqlite3c.tcl f4ef476510eca4124c874a72029f1e01bc54a896b1724e8f9eef0d8bfa
 F tool/mksqlite3h.tcl 1f5e4a1dbbbc43c83cc6e74fe32c6c620502240b66c7c0f33a51378e78fc4edf
 F tool/showlocks.c 9cc5e66d4ebbf2d194f39db2527ece92077e86ae627ddd233ee48e16e8142564
 F tool/speed-check.sh 615cbdf50f1409ef3bbf9f682e396df80f49d97ed93ed3e61c8e91fae6afde58
-P d90a37e930c66afe95165955ae47efde08f52c8ce16c4fb239da0233335db050
-R 72218426ef74a11d61ac53b296190ebf
+P 587ded6035a3ce91db81a29fe34ed30d0e59022cba6f107f25b04d034ef37ba9
+R 831bdc39962e2b4ff60a753fe2bb6e80
 U drh
-Z f566ae76cfb821dbe7826b51a1058958
+Z fbd73fea0049f831d8aafb6160e31d52

diff --git a/manifest.uuid b/manifest.uuid
index 903edaec5f6b86e8f6be726993f5385093a8950d..d6fb012a397201e85dd9ff78fb0797a51d7e2adc 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-587ded6035a3ce91db81a29fe34ed30d0e59022cba6f107f25b04d034ef37ba9
\ No newline at end of file
+270e17bba1d35f8c300844e75b2aa15f79a1ab62e40bc5e6bc9694902f8f7dde
\ No newline at end of file

diff --git a/src/update.c b/src/update.c
index 761d4a63dc44a84fce048870519b6ed0792f32cd..9fdc1e84e602e6e17ae945e24cae0eff253489de 100644 (file)
--- a/src/update.c
+++ b/src/update.c
@@ -246,8 +246,7 @@ static void updateFromSelect(
     }
 #endif
   }
-  assert( pChanges || db->mallocFailed );
-  if( pChanges ){
+  if( ALWAYS(pChanges) ){
     for(i=0; i<pChanges->nExpr; i++){
       pList = sqlite3ExprListAppend(pParse, pList, 
           sqlite3ExprDup(db, pChanges->a[i].pExpr, 0)