From: drh <>
Date: Sat, 23 Jul 2022 00:44:44 +0000 (+0000)
Subject: Use sqlite3ParserAddCleanup() rather than pParse->pConstExpr to implement
X-Git-Tag: version-3.40.0~282
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ee6b80c3b50efb65630584eb9001d2771055ff8d;p=thirdparty%2Fsqlite.git

Use sqlite3ParserAddCleanup() rather than pParse->pConstExpr to implement
sqlite3ExprDeferredDelete().  This is a better solution than check-in
[c538d07535092722].

FossilOrigin-Name: 2a6f6971fa010219323b976ff53b2606e39fb43fd36c394837c3a8528bf3c425
---

diff --git a/manifest b/manifest
index ddd8d2b466..07ebf75ee4 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Omit\sthe\sEP_MemToken\sflag\sthat\swas\smade\sobsolete\sby\s[e1f1cfe7f4387b60],\sfor\na\ssize\sreduction\sand\sperformance\sincrease.
-D 2022-07-22T19:28:04.965
+C Use\ssqlite3ParserAddCleanup()\srather\sthan\spParse->pConstExpr\sto\simplement\nsqlite3ExprDeferredDelete().\s\sThis\sis\sa\sbetter\ssolution\sthan\scheck-in\s\n[c538d07535092722].
+D 2022-07-23T00:44:44.539
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -521,7 +521,7 @@ F src/date.c 272162554168e7af4976213850e1c4c5f33b964d299ceb0983f3d5cceba01d05
 F src/dbpage.c 5808e91bc27fa3981b028000f8fadfdc10ce9e59a34ce7dc4e035a69be3906ec
 F src/dbstat.c 861e08690fcb0f2ee1165eff0060ea8d4f3e2ea10f80dab7d32ad70443a6ff2d
 F src/delete.c a8e844af211a48b13b5b358be77a12c860c6a557c21990ad51a548e2536500ce
-F src/expr.c 44f6b019a581f7c5a6599464d76d19111427edfa2710b4f007968fc64aaed0d1
+F src/expr.c 78a1b6c13306efaf563e9340732a2d651f792c488b7795a25f1f6a853e07ef25
 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
 F src/fkey.c d965ede15d8360c09ed59348940649ee647b192e784466837d7aefa836d1d91e
 F src/func.c 8f72e88cccdee22185133c10f96ccd61dc34c5ea4b1fa9a73c237ef59b2e64f1
@@ -1981,8 +1981,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 c538d075350927222ab0a6598b844f7b15153c5dc008d71b921a2b73c4f4a7a4
-R 0a28921b7e90ddf823369af11249c300
+P 28934a9d92d5e5ac862a0dc7169f071f39047f98dc79441db697cf353a4b9433
+R 88cc25988976487ed2e20df47dba68d4
 U drh
-Z 8e5ad3553ebf08b44289f99a5ac2ab7d
+Z fe526c3fdeb2c1220cb11dfe559b4150
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 15e2267724..f97e721aa1 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-28934a9d92d5e5ac862a0dc7169f071f39047f98dc79441db697cf353a4b9433
\ No newline at end of file
+2a6f6971fa010219323b976ff53b2606e39fb43fd36c394837c3a8528bf3c425
\ No newline at end of file
diff --git a/src/expr.c b/src/expr.c
index 3801fb98f4..8edab3298a 100644
--- a/src/expr.c
+++ b/src/expr.c
@@ -1270,8 +1270,9 @@ void sqlite3ClearOnOrUsing(sqlite3 *db, OnOrUsing *p){
 ** pExpr to the pParse->pConstExpr list with a register number of 0.
 */
 void sqlite3ExprDeferredDelete(Parse *pParse, Expr *pExpr){
-  pParse->pConstExpr = 
-      sqlite3ExprListAppend(pParse, pParse->pConstExpr, pExpr);
+  sqlite3ParserAddCleanup(pParse,
+    (void(*)(sqlite3*,void*))sqlite3ExprDelete,
+    pExpr);
 }
 
 /* Invoke sqlite3RenameExprUnmap() and sqlite3ExprDelete() on the
@@ -4207,7 +4208,6 @@ expr_code_doover:
       int n;
       const char *z;
       char *zBlob;
-      if( pParse->nErr ) return target;
       assert( !ExprHasProperty(pExpr, EP_IntValue) );
       assert( pExpr->u.zToken[0]=='x' || pExpr->u.zToken[0]=='X' );
       assert( pExpr->u.zToken[1]=='\'' );