Mark branches that are believed to be unreachable.

FossilOrigin-Name: 18ed9736fbbea762e04b8ad156e83e577e60c5234a5e233540ad8664fe3b379c

diff --git a/manifest b/manifest
index fbb9b5acf87ef4e4ce1b4ab2ab210f537b92c618..42d05f3e8ac15b665577837df997b165d9cb7595 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Instead\sof\sadding\sa\sbranch\sto\sOP_IdxInsert,\suse\san\sextra\sOP_IfNull\swhen\supdating\sindexes\son\sexpressions.
-D 2026-04-22T18:19:24.834
+C Mark\sbranches\sthat\sare\sbelieved\sto\sbe\sunreachable.
+D 2026-04-22T19:12:48.603
 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@ -802,7 +802,7 @@ F src/upsert.c 215328c3f91623c520ec8672c44323553f12caeb4f01b1090ebdca99fdf7b4f1
 F src/utf.c 7267c3fb9e2467020507601af3354c2446c61f444387e094c779dccd5ca62165
 F src/util.c 377af5da226519a0f374dc3c6d408c9d303a92943e3ae5986432c7d52e6679a2
 F src/vacuum.c d3d35d8ae893d419ade5fa196d761a83bddcbb62137a1a157ae751ef38b26e82
-F src/vdbe.c f712fdd7ccd92909505bcc28337253a9513fe1efd1843e1a6979fc27cac6ea22
+F src/vdbe.c 2b6df85980adb3d12c61d4cbffa6230efa882f63c4e3ab81001831beb758d24c
 F src/vdbe.h 70e862ac8a11b590f8c1eaac17a0078429d42bc4ea3f757a9af0f451dd966a71
 F src/vdbeInt.h c31ba4dc8d280c2b1dc89c6fcee68f2555e3813ab34279552c20b964c0e338b1
 F src/vdbeapi.c 6cdcbe5c7afa754c998e73d2d5d2805556268362914b952811bdfb9c78a37cf1
@@ -2203,8 +2203,8 @@ F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee
 F tool/warnings.sh a554d13f6e5cf3760f041b87939e3d616ec6961859c3245e8ef701d1eafc2ca2
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
 F tool/winmain.c 00c8fb88e365c9017db14c73d3c78af62194d9644feaf60e220ab0f411f3604c
-P 3576b6930436b3149c5033476f70518e9b4adeaeec2538a68b7dc599eb854c47
-R b8a2538a20428510beaafc7bf9bc4782
-U dan
-Z 04d4e5d468d41e61fb06710b6120ac96
+P 5112f96cb1428693614b91bcca78326fccf7289e395a920339676ceeba871e3f
+R b81c729d8d931370d59698df4d8d923d
+U drh
+Z 51be1ac13abf50f45b9e7dc7cfaa2e21
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 03224c183171666993b6a763eb1db19207395997..75ba9040961a850ad2e8479a077380230aeafdf5 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5112f96cb1428693614b91bcca78326fccf7289e395a920339676ceeba871e3f
+18ed9736fbbea762e04b8ad156e83e577e60c5234a5e233540ad8664fe3b379c

diff --git a/src/vdbe.c b/src/vdbe.c
index 47e3324b0e14a943aeaebb4564ae045ea7c15c23..7ac59914c4837bbf89289aa5ccd0f66211d3bb14 100644 (file)
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -811,7 +811,7 @@ static SQLITE_NOINLINE int vdbeIndexKeyCompare(
 
   assert( pMem->flags & (MEM_Blob|MEM_Null) );
   nKey = sqlite3BtreePayloadSize(pCsr);
-  if( nKey==pMem->n && (pMem->flags & MEM_Blob) ){
+  if( nKey==pMem->n && ALWAYS((pMem->flags & MEM_Blob)!=0) ){
     /* This code could just use sqlite3BtreePayloadFetch(). But calling that
     ** function here apparently prevents compilers from inlining it in other,
     ** more performance critical, places. So this code uses
@@ -820,7 +820,7 @@ static SQLITE_NOINLINE int vdbeIndexKeyCompare(
     Mem m;
     memset(&m, 0, sizeof(m));
     *pRc = sqlite3VdbeMemFromBtreeZeroOffset(pCsr, nKey, &m);
-    ret = (*pRc!=SQLITE_OK || 0==memcmp(pMem->z, m.z, nKey));
+    ret = (NEVER(*pRc!=SQLITE_OK) || 0==memcmp(pMem->z, m.z, nKey));
     sqlite3VdbeMemReleaseMalloc(&m);
   }
 
@@ -6709,7 +6709,7 @@ case OP_IdxDelete: {
   }
 
   if( pOp->p3 && vdbeIndexKeyCompare(pCrsr, &aMem[pOp->p3], &rc) ){
-    if( rc ) goto abort_due_to_error;
+    if( NEVER(rc) ) goto abort_due_to_error;
     sqlite3VdbeMemSetNull(&aMem[pOp->p3]);
     break;
   }