Tag an always-taken branch using ALWAYS().

FossilOrigin-Name: ad8bc3d7443ff57ce5a8756428e717ac42ec0295191a9b4d7ae44846d8fa03a2

diff --git a/manifest b/manifest
index 911821ee8f420f17e9d2cba8c565ad4ebdd0ee0e..24a5d04278d50696f086201f97593ecfd5c92c55 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Optimizations\sto\sthe\sOP_Found\sopcode\ssave\sabout\s600K\scycles\sin\sspeedtest1.
-D 2022-04-04T19:43:57.944
+C Tag\san\salways-taken\sbranch\susing\sALWAYS().
+D 2022-04-04T19:58:55.827
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -628,7 +628,7 @@ F src/vdbe.c 61ff67a29b89214c928631be206af9cb5f820ed46b8cec3e58308fea205123e4
 F src/vdbe.h 89f5edb1422c8783a0b29db836e409876f2b3e847f78e2b21b1fbcc48a93f85f
 F src/vdbeInt.h 5f3d0abcf30c2b7a6672ad4386f18be0fca9c9b2cefe18f85a2e3df74f2613bf
 F src/vdbeapi.c 354c893f1500cf524cc45c32879b9c68893a28b77e3442c24668d6afe4236217
-F src/vdbeaux.c 19cd7117723ef31ca31ffffb12cd0298c1b24e4a7b2d920c19f1615bb0023b6d
+F src/vdbeaux.c 567ddcdd5d875161201e9752144834d1519e7e856e2da410619d88a9cfefe70d
 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 328dc76657eb5317f0201859d2b3abe6918103b894f7beaed0aca3058a9f2b64
-R ac8b3e120e5046f4e8f53f05766d7e6a
+P 5c3357ad62843fe982b9c2d31dbf02018f2948ceab2c85dac917cd9ce1e97dd6
+R e1baec0a4623bc482b84ffca80620d79
 U drh
-Z 8545e3f2f52a7362bf82a3c0cf610720
+Z 85eb1104cf0cb5341f01b52e5988e935
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index a05f745f93cf328fb2beef5b39c5d8d1fe59a5d6..72687ca8ac4601b65588c3df6b36bbfdf29463ac 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5c3357ad62843fe982b9c2d31dbf02018f2948ceab2c85dac917cd9ce1e97dd6
\ No newline at end of file
+ad8bc3d7443ff57ce5a8756428e717ac42ec0295191a9b4d7ae44846d8fa03a2
\ No newline at end of file

diff --git a/src/vdbeaux.c b/src/vdbeaux.c
index d9a5236f32ede32fdbf3cda414c519883a7c29f1..551236226bf02b1ce31979ed9e6a5e898a4a529a 100644 (file)
--- a/src/vdbeaux.c
+++ b/src/vdbeaux.c
@@ -597,7 +597,7 @@ void sqlite3VdbeRunOnlyOnce(Vdbe *p){
 void sqlite3VdbeReusable(Vdbe *p){
   int i;
   for(i=1; ALWAYS(i<p->nOp); i++){
-    if( p->aOp[i].opcode==OP_Expire ){
+    if( ALWAYS(p->aOp[i].opcode==OP_Expire) ){
       p->aOp[1].opcode = OP_Noop;
       break;
     }