From: drh <>
Date: Sat, 16 Mar 2024 19:48:51 +0000 (+0000)
Subject: Assert that the eCode is always non-zero upon entry into exprNodeIsConstant().
X-Git-Tag: version-3.46.0~123^2~10^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4713b2d73ca0053671c7b6e8502647e1a2c0a411;p=thirdparty%2Fsqlite.git

Assert that the eCode is always non-zero upon entry into exprNodeIsConstant().

FossilOrigin-Name: f71b28f6713126745bca53e098dfe3444d4235d6a2b87ced5b333a7f0ee79be8
---

diff --git a/manifest b/manifest
index 8f71171d11..fb57f31af9 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Activate\sthe\senhanced\sconstant-expression\sfor\sthe\n[constant\spropagation\soptimization](/info/f4229707ac08d66c).
-D 2024-03-16T19:36:18.764
+C Assert\sthat\sthe\seCode\sis\salways\snon-zero\supon\sentry\sinto\sexprNodeIsConstant().
+D 2024-03-16T19:48:51.062
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -700,7 +700,7 @@ F src/date.c 126ba2ab10aeb2e7ba6e089b5f07b747c0625b8287f78b60da346eda8d23c875
 F src/dbpage.c 80e46e1df623ec40486da7a5086cb723b0275a6e2a7b01d9f9b5da0f04ba2782
 F src/dbstat.c 3b677254d512fcafd4d0b341bf267b38b235ccfddbef24f9154e19360fa22e43
 F src/delete.c cb766727c78e715f9fb7ec8a7d03658ed2a3016343ca687acfcec9083cdca500
-F src/expr.c b3914ec5ac4f1c43d0743123fabab27c089f16dcfdcfd47973e2eebe0834f94b
+F src/expr.c a6cc77ccca00905f5ba0739dd8112fcb0411231d9228239553829a85bf35b0dd
 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
 F src/fkey.c a47610f0a5c6cb0ad79f8fcef039c01833dec0c751bb695f28dc0ec6a4c3ba00
 F src/func.c 4204c56196847faefef57fa14e43b8e4d65eb8d7e65318abe463472e3fd148cb
@@ -2179,8 +2179,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P dae669245c86021bcd28716aff6e316257cc8075d02081745d4b7de17f8ad553
-R 02d7863e0170a404854cbdb7daab35da
+P 92afea38881a1a4f266c79ddc6e1027cf17c288dcc8f7e7d50466899ac0054c4
+R 03a747756d1c2eaa7bed49327f66bff5
 U drh
-Z 4782493dacf06603b1147674a9e69d60
+Z 34a5fcb15810c923d4200d4da137f642
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 7aaeff4fab..5218da70b2 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-92afea38881a1a4f266c79ddc6e1027cf17c288dcc8f7e7d50466899ac0054c4
\ No newline at end of file
+f71b28f6713126745bca53e098dfe3444d4235d6a2b87ced5b333a7f0ee79be8
\ No newline at end of file
diff --git a/src/expr.c b/src/expr.c
index 95567de799..66070db5b9 100644
--- a/src/expr.c
+++ b/src/expr.c
@@ -2372,7 +2372,6 @@ static SQLITE_NOINLINE int exprNodeIsConstantFunction(
   sqlite3 *db;       /* The database */
 
   assert( pExpr->op==TK_FUNCTION );
-  if( pWalker->eCode==0 ) return WRC_Abort;
   pList = pExpr->x.pList;
   if( pList==0 ){
     n = 0;
@@ -2421,6 +2420,7 @@ static SQLITE_NOINLINE int exprNodeIsConstantFunction(
 ** malformed schema error.
 */
 static int exprNodeIsConstant(Walker *pWalker, Expr *pExpr){
+  assert( pWalker->eCode>0 );
 
   /* If pWalker->eCode is 2 then any term of the expression that comes from
   ** the ON or USING clauses of an outer join disqualifies the expression