Loop optimization in the OP_MakeRecord opcode.

FossilOrigin-Name: 47a61fbd63928021098fbe492283f1afda7c293b3b2706c001192ae4ff1b2cbe

diff --git a/manifest b/manifest
index 090b7eeb5f03bf254a12e07a72d1eb1381bd9a96..fd9b50465557bd442b0612d418c35475117d0575 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C It\sis\snot\snecessary\sto\sde-ephermeralize\sthe\soutput\sregisters\sin\sthe\nOP_ResultRow\sopcode.\s\sOmit\sthat\sstep\sfor\sa\ssize\sreduction\sand\sperformance\nincrease.
-D 2022-04-01T20:19:36.366
+C Loop\soptimization\sin\sthe\sOP_MakeRecord\sopcode.
+D 2022-04-01T20:39:40.291
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -624,7 +624,7 @@ F src/upsert.c 8789047a8f0a601ea42fa0256d1ba3190c13746b6ba940fe2d25643a7e991937
 F src/utf.c ee39565f0843775cc2c81135751ddd93eceb91a673ea2c57f61c76f288b041a0
 F src/util.c 602fe229f32a96ceccae4f40824129669582096f7c355f53dbac156c9fecef23
 F src/vacuum.c 6c38ddc52f0619865c91dae9c441d4d48bf3040d7dc1bc5b22da1e45547ed0b3
-F src/vdbe.c c8f0fc516a54aa9c696ca0cd4f54b550ea86ab08bcee70b8982f5e3b0305ab8b
+F src/vdbe.c 0e54be9acfe26e68b94d946cbaf0c8dfe94435e8a506f22ad5550ae4db1d7a0c
 F src/vdbe.h a1d0e3b934e835e73edd146f2e7c4eadb711b5c9875c18159a57483fd78e550e
 F src/vdbeInt.h 22babf1e585ae7e5c49f2e6442969b88f07bdcc3d154164346d25ef4efa3ebf3
 F src/vdbeapi.c 5c498998c99667f16cac2519f2fa439fe46acf99a332b0caa73637fc2ab35c22
@@ -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 44be7f46ba89289683ed0e123169ca9adb1018de03071d66de480c910a23d074
-R e4956d08253d673d906bef0462c4e505
+P 8a07745aed1d0a4eead55d43f1923597b12371f307ecf5bc19c5a1db9a107a50
+R 8f846dfb58734bb88c205139ba75a9df
 U drh
-Z 404f89fed3d9a2adc89e028bcb714881
+Z 0a0d680f496f86b11293db3c46b2ee9c
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 9df36ca5dfe6579864cf205d6bd3b21e4abbefbd..246b8f5a896cbf6b60987670570fe70769ce9b0b 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-8a07745aed1d0a4eead55d43f1923597b12371f307ecf5bc19c5a1db9a107a50
\ No newline at end of file
+47a61fbd63928021098fbe492283f1afda7c293b3b2706c001192ae4ff1b2cbe
\ No newline at end of file

diff --git a/src/vdbe.c b/src/vdbe.c
index c3894560ccceebe7de772d4890c825ae5b4068af..8ad6cd19f62355a6af6c5c4cf3b6d7771725516e 100644 (file)
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -3377,7 +3377,7 @@ case OP_MakeRecord: {
   zHdr += putVarint32(zHdr, nHdr);
   assert( pData0<=pLast );
   pRec = pData0;
-  do{
+  while( 1 /*exit-by-break*/ ){
     serial_type = pRec->uTemp;
     /* EVIDENCE-OF: R-06529-47362 Following the size varint are one or more
     ** additional varints, one per column. */
@@ -3385,7 +3385,9 @@ case OP_MakeRecord: {
     /* EVIDENCE-OF: R-64536-51728 The values for each column in the record
     ** immediately follow the header. */
     zPayload += sqlite3VdbeSerialPut(zPayload, pRec, serial_type); /* content */
-  }while( (++pRec)<=pLast );
+    if( pRec==pLast ) break;
+    pRec++;
+  }
   assert( nHdr==(int)(zHdr - (u8*)pOut->z) );
   assert( nByte==(int)(zPayload - (u8*)pOut->z) );