Expand the getVarint32() macro in a few places, as the C-compiler seems to

be able to optimize better when that macro is expanded manually.

FossilOrigin-Name: cd4fe34b98bf5ce26f3596c717edb73932f3b46ad6e9b4934d06b7b3c176a0d6

4 files changed, 24 insertions, 12 deletions

diff --git a/manifest b/manifest
index d8da92f2f..f05cad7f4 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sharmless\scompiler\swarnings.
-D 2022-04-02T20:08:48.365
+C Expand\sthe\sgetVarint32()\smacro\sin\sa\sfew\splaces,\sas\sthe\sC-compiler\sseems\sto\nbe\sable\sto\soptimize\sbetter\swhen\sthat\smacro\sis\sexpanded\smanually.
+D 2022-04-02T22:47:47.656
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -624,11 +624,11 @@ F src/upsert.c 8789047a8f0a601ea42fa0256d1ba3190c13746b6ba940fe2d25643a7e991937
 F src/utf.c ee39565f0843775cc2c81135751ddd93eceb91a673ea2c57f61c76f288b041a0
 F src/util.c 602fe229f32a96ceccae4f40824129669582096f7c355f53dbac156c9fecef23
 F src/vacuum.c 6c38ddc52f0619865c91dae9c441d4d48bf3040d7dc1bc5b22da1e45547ed0b3
-F src/vdbe.c dbe88250144988bf8481aa5c98714cb5f0ce355213dcc4a458a3d2062ccc54c6
+F src/vdbe.c 52b9afb8df338c7a392332ecfe71c748817b72abfcc1bb90c61d10264aa6db53
 F src/vdbe.h a1d0e3b934e835e73edd146f2e7c4eadb711b5c9875c18159a57483fd78e550e
 F src/vdbeInt.h 88c11169ac35488764e6275017610ddbaaa0e51acd260ea61638f9ccce578d7c
 F src/vdbeapi.c 5c498998c99667f16cac2519f2fa439fe46acf99a332b0caa73637fc2ab35c22
-F src/vdbeaux.c 7a9df2e5700351221a152775e05d0b4ce9aa73b0d04bcfabeb85ab2229052bac
+F src/vdbeaux.c d928cca15c31da201e0198b10fe29ffc001a0d1dfcffdcee6c6acce2360f0053
 F src/vdbeblob.c 5e61ce31aca17db8fb60395407457a8c1c7fb471dde405e0cd675974611dcfcd
 F src/vdbemem.c 062cd58c54f887dc2eeb865686251c17237f791f0e6394e9c6f7a6f3c1a7e206
 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 35441eb5e1447e01f2031837a4ede705bce34f87be27912278cc730abce6cf05
-R 0de4cbf018f5e69209b41b7da65c596e
+P 8a3a3486358d076c34e515ac92663a04f0c7ff10f405094cb5b6ada0d5f05cdc
+R a6b1bae040909e67200132c66e5ed3d0
 U drh
-Z ddceb08a72931a4b051462e72474673d
+Z b06751a34dfdacfa9d4b7d6e9de9abea
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index d87692bdb..364727c8d 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-8a3a3486358d076c34e515ac92663a04f0c7ff10f405094cb5b6ada0d5f05cdc
\ No newline at end of file
+cd4fe34b98bf5ce26f3596c717edb73932f3b46ad6e9b4934d06b7b3c176a0d6
\ No newline at end of file
diff --git a/src/vdbe.c b/src/vdbe.c
index c66680220..bb23757d6 100644
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -2739,7 +2739,11 @@ op_column_restart:
       assert( pC->szRow<=65536 );  /* Maximum page size is 64KiB */
     }
     pC->cacheStatus = p->cacheCtr;
-    pC->iHdrOffset = getVarint32(pC->aRow, aOffset[0]);
+    if( (aOffset[0] = pC->aRow[0])<0x80 ){
+      pC->iHdrOffset = 1;
+    }else{
+      pC->iHdrOffset = sqlite3GetVarint32(pC->aRow, aOffset);
+    }
     pC->nHdrParsed = 0;
 
     if( pC->szRow<aOffset[0] ){      /*OPTIMIZATION-IF-FALSE*/
diff --git a/src/vdbeaux.c b/src/vdbeaux.c
index aa45cae54..8fdd85abb 100644
--- a/src/vdbeaux.c
+++ b/src/vdbeaux.c
@@ -4419,14 +4419,22 @@ int sqlite3VdbeRecordCompareWithSkip(
   ** two elements in the keys are equal. Fix the various stack variables so
   ** that this routine begins comparing at the second field. */
   if( bSkip ){
-    u32 s1;
-    idx1 = 1 + getVarint32(&aKey1[1], s1);
+    u32 s1 = aKey1[1];
+    if( s1<0x80 ){
+      idx1 = 2;
+    }else{
+      idx1 = 1 + sqlite3GetVarint32(&aKey1[1], &s1);
+    }
     szHdr1 = aKey1[0];
     d1 = szHdr1 + sqlite3VdbeSerialTypeLen(s1);
     i = 1;
     pRhs++;
   }else{
-    idx1 = getVarint32(aKey1, szHdr1);
+    if( (szHdr1 = aKey1[0])<0x80 ){
+      idx1 = 1;
+    }else{
+      idx1 = sqlite3GetVarint32(aKey1, &szHdr1);
+    }
     d1 = szHdr1;
     i = 0;
   }