From: drh <>
Date: Thu, 4 Mar 2021 18:34:54 +0000 (+0000)
Subject: Put ALWAYS() on a branch that is now always true because of changes
X-Git-Tag: version-3.35.0~41
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=91be05a9108082104e3a1501f0cb328e7298ae40;p=thirdparty%2Fsqlite.git

Put ALWAYS() on a branch that is now always true because of changes
in OOM behavior due to check-in [9adf6e2469d18bc3].

FossilOrigin-Name: 8a1bb9c3e92085fb71d75eb36f64eb85053a4730fd314acd401e7ad32c274748
---

diff --git a/manifest b/manifest
index ffdc717705..2e04a3c816 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Update\sshell.c.in\sso\sthat\sSQLITE_SHELL_IS_UTF8\sis\sset\sto\s0\sif\sthe\s-municode\soption\sis\spassed\sto\sgcc\son\swindows.
-D 2021-03-04T18:31:07.199
+C Put\sALWAYS()\son\sa\sbranch\sthat\sis\snow\salways\strue\sbecause\sof\schanges\nin\sOOM\sbehavior\sdue\sto\scheck-in\s[9adf6e2469d18bc3].
+D 2021-03-04T18:34:54.016
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -540,7 +540,7 @@ F src/pragma.h 8dc78ab7e9ec6ce3ded8332810a2066f1ef6267e2e03cd7356ee00276125c6cf
 F src/prepare.c f634a9e799a6b1c136d8ee12479cffa22862bfb807d307b1db406aa0cdb042a5
 F src/printf.c 2b03a80d7c11bb422115dca175a18bf430e9c9dbaa0eee63b758f0c022f8f34f
 F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
-F src/resolve.c 022aeaa3f3ef6faf76c48fffa97a7ec906606d175a1cd3dd5c186543fa7a1fa3
+F src/resolve.c da978d6fdfc9648dda88366e92467a2061945ae42dd102ecd977b04458365abe
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
 F src/select.c c213c99cfb85cee59138c18969d656a206a5b7ef0f3a1734b4b617f3cda82f84
 F src/shell.c.in af18a2e980aabe739a8188266464866fe7947b100674e07480e7ba3e37595947
@@ -1909,7 +1909,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 20d7dc120dc964a0236da719e4de22bff5110b95da396e2ac6790e9f6b667899
-R c493558e2c42471297f2d692670b7ff9
-U dan
-Z 86f3ac1e31f812b542c339af82b7fb29
+P 99e6a0f020fadda4011e4ca370d2421dbf2f97f6fb004fcbba9bd6c76faf7a73
+R 9cce259d8f3bbb9344c7275c766df98e
+U drh
+Z c0b3e80106ce53c25b91b8940f804e9d
diff --git a/manifest.uuid b/manifest.uuid
index 80994a529c..e76060d7f8 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-99e6a0f020fadda4011e4ca370d2421dbf2f97f6fb004fcbba9bd6c76faf7a73
\ No newline at end of file
+8a1bb9c3e92085fb71d75eb36f64eb85053a4730fd314acd401e7ad32c274748
\ No newline at end of file
diff --git a/src/resolve.c b/src/resolve.c
index 82c6c968b7..6853965985 100644
--- a/src/resolve.c
+++ b/src/resolve.c
@@ -1127,7 +1127,7 @@ static int resolveExprStep(Walker *pWalker, Expr *pExpr){
       assert( !ExprHasProperty(pExpr, EP_Reduced) );
       /* Handle special cases of "x IS TRUE", "x IS FALSE", "x IS NOT TRUE",
       ** and "x IS NOT FALSE". */
-      if( pRight && (pRight->op==TK_ID || pRight->op==TK_TRUEFALSE) ){
+      if( ALWAYS(pRight) && (pRight->op==TK_ID || pRight->op==TK_TRUEFALSE) ){
         int rc = resolveExprStep(pWalker, pRight);
         if( rc==WRC_Abort ) return WRC_Abort;
         if( pRight->op==TK_TRUEFALSE ){