Performance increase in the loop that frees an opcode array.

FossilOrigin-Name: 4ccebb86aae178dbce905d782f04d98211f8fce9aacd71c12b8694c92a4f5c40

diff --git a/manifest b/manifest
index a5a4107b3bf575243c22b266e3d0e8e82c8fbef8..bfa5d8e3763b45c93a4d1d6bb0c04d64e70ce9d5 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Another\ssmall\sperformance\sgain\sby\susing\ssqlite3DbFreeNN().
-D 2022-03-28T14:56:47.340
+C Performance\sincrease\sin\sthe\sloop\sthat\sfrees\san\sopcode\sarray.
+D 2022-03-28T15:06:36.675
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -628,7 +628,7 @@ F src/vdbe.c b1830c6daf744473a732257652b6431ac18032f508a3e30ff3a1466fe5978559
 F src/vdbe.h a1d0e3b934e835e73edd146f2e7c4eadb711b5c9875c18159a57483fd78e550e
 F src/vdbeInt.h 8dd91427155a38ec06e9ecbde07e33f21bc02e101625191e7613f883e379a363
 F src/vdbeapi.c bc3812dff7c9e6497c87ae86962818a51f66f8d7a873e7ec02a22aa115b84799
-F src/vdbeaux.c eb7e1379abdd414b8585510e137a7061196c6d55a0d5a4c9e9c60b7d45bcb414
+F src/vdbeaux.c 1de06d17a1af1bf5cc776e60afcc01c49438df90863fc4db0a0516060e7b959a
 F src/vdbeblob.c 5e61ce31aca17db8fb60395407457a8c1c7fb471dde405e0cd675974611dcfcd
 F src/vdbemem.c 57fceb4ed6aac960e9517c963dc0668189e8b7c8e6216d257030a2f5e9a583df
 F src/vdbesort.c 43756031ca7430f7aec3ef904824a7883c4ede783e51f280d99b9b65c0796e35
@@ -1945,8 +1945,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 b12de0ecc78a4f654c8e7b2b17cc2201688808a4f516908e9563a216677e655c
-R 240acd8eb9a53671ac46c1b4413159b7
+P daa924af987253345bdb1c71b13378681bd252521e94d01f5d4629601232c352
+R 3f80c1c90cf9e3dfa7b095bf09b6a361
 U drh
-Z 55979c13a79d18f654ea77f2201d732c
+Z b8e292382fc35254c1fc18d26e049666
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 9b1468fc0d055278351933ef22cdbbc05f4c92bf..c22cb673ca84b4e7315745fd3f3faf8d7db270f2 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-daa924af987253345bdb1c71b13378681bd252521e94d01f5d4629601232c352
\ No newline at end of file
+4ccebb86aae178dbce905d782f04d98211f8fce9aacd71c12b8694c92a4f5c40
\ No newline at end of file

diff --git a/src/vdbeaux.c b/src/vdbeaux.c
index ad26075d47e7469eb379b042e5b850f0fa3d804b..56b433ef620354339615e377a13ab135ea50dc57 100644 (file)
--- a/src/vdbeaux.c
+++ b/src/vdbeaux.c
@@ -1152,13 +1152,16 @@ static void freeP4(sqlite3 *db, int p4type, void *p4){
 ** nOp entries. 
 */
 static void vdbeFreeOpArray(sqlite3 *db, Op *aOp, int nOp){
+  assert( nOp>=0 );
   if( aOp ){
-    Op *pOp;
-    for(pOp=&aOp[nOp-1]; pOp>=aOp; pOp--){
+    Op *pOp = &aOp[nOp-1];
+    while(1){  /* Exit via break */
       if( pOp->p4type <= P4_FREE_IF_LE ) freeP4(db, pOp->p4type, pOp->p4.p);
 #ifdef SQLITE_ENABLE_EXPLAIN_COMMENTS
       sqlite3DbFree(db, pOp->zComment);
 #endif     
+      if( pOp==aOp ) break;
+      pOp--;
     }
     sqlite3DbFreeNN(db, aOp);
   }