From: drh <>
Date: Tue, 1 Jul 2025 20:32:45 +0000 (+0000)
Subject: Improved byte-code comments for the short-circuit optimization of
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=46bfcc1a2171a4c6d1eec034d2f96181f987801d;p=thirdparty%2Fsqlite.git

Improved byte-code comments for the short-circuit optimization of
[0083d5169a46104a], to aid in debugging.

FossilOrigin-Name: 113f9d10e347eeaa893ff8b47a461009e0b12589374b93cf3e0bddd19c702dea
---

diff --git a/manifest b/manifest
index 244c6b5bf3..e3075f56a4 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Cache\sand\sreuse\svirtual\stable\scursors\sin\sthe\sbytecode\sengine.
-D 2025-07-01T17:36:55.244
+C Improved\sbyte-code\scomments\sfor\sthe\sshort-circuit\soptimization\sof\n[0083d5169a46104a],\sto\said\sin\sdebugging.
+D 2025-07-01T20:32:45.457
 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@ -736,7 +736,7 @@ F src/date.c 9db4d604e699a73e10b8e85a44db074a1f04c0591a77e2abfd77703f50dce1e9
 F src/dbpage.c b3e218f8ed74fcbb7fa805df8ca669a3718d397617b3d8a8aac3307dc315c4d6
 F src/dbstat.c 73362c0df0f40ad5523a6f5501224959d0976757b511299bf892313e79d14f5c
 F src/delete.c 03a77ba20e54f0f42ebd8eddf15411ed6bdb06a2c472ac4b6b336521bf7cea42
-F src/expr.c 18108701c8b2fcb995143f0217f650d03359f93e2af9e181876436fb71ad4593
+F src/expr.c e3d3b6e60b86fac772bd4d4f0c6fe1d01bef3851754a9c1215d2f8574296cbd2
 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
 F src/fkey.c 928ed2517e8732113d2b9821aa37af639688d752f4ea9ac6e0e393d713eeb76f
 F src/func.c de47a8295503aa130baae5e6d9868ecf4f7c4dbffa65d83ad1f70bdbac0ee2d6
@@ -2208,8 +2208,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350
 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
 F tool/warnings.sh 1ad0169b022b280bcaaf94a7fa231591be96b514230ab5c98fbf15cd7df842dd
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 8afd6ca85724a69970181042d6aac53742ea2b76ded5966b2541c3afe1121fb9
-R a0d75f1fb250395135fba17ef3bc4dc0
+P 2d187d4232d750cb1840f1d89c8aed65962cb0883c1d7f91c554b451e475c514
+R 514121d017fa6dee51263403393090a8
 U drh
-Z 8fcf407f538f5f9f65ff8d90a37c91a0
+Z 688f46cf0060385046556b19c2a8341b
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index cec73c0740..db1994fb89 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-2d187d4232d750cb1840f1d89c8aed65962cb0883c1d7f91c554b451e475c514
+113f9d10e347eeaa893ff8b47a461009e0b12589374b93cf3e0bddd19c702dea
diff --git a/src/expr.c b/src/expr.c
index 9ed0a121ec..c8dfd3af33 100644
--- a/src/expr.c
+++ b/src/expr.c
@@ -2424,7 +2424,9 @@ static int exprComputeOperands(
   */
   if( exprEvalRhsFirst(pExpr) && sqlite3ExprCanBeNull(pExpr->pRight) ){
     r2 = sqlite3ExprCodeTemp(pParse, pExpr->pRight, pFree2);
-    addrIsNull = sqlite3VdbeAddOp1(v, OP_IsNull, r2);  VdbeCoverage(v);
+    addrIsNull = sqlite3VdbeAddOp1(v, OP_IsNull, r2);
+    VdbeComment((v, "skip left operand"));
+    VdbeCoverage(v);
   }else{
     addrIsNull = 0;
   }
@@ -2439,7 +2441,9 @@ static int exprComputeOperands(
     if( ExprHasProperty(pExpr->pRight, EP_Subquery)
      && sqlite3ExprCanBeNull(pExpr->pLeft)
     ){
-      addrIsNull = sqlite3VdbeAddOp1(v, OP_IsNull, r1);  VdbeCoverage(v);
+      addrIsNull = sqlite3VdbeAddOp1(v, OP_IsNull, r1);
+      VdbeComment((v, "skip right operand"));
+      VdbeCoverage(v);
     }
     r2 = sqlite3ExprCodeTemp(pParse, pExpr->pRight, pFree2);
   }
@@ -5112,6 +5116,7 @@ expr_code_doover:
         sqlite3VdbeAddOp2(v, OP_Goto, 0, sqlite3VdbeCurrentAddr(v)+2);
         sqlite3VdbeJumpHere(v, addrIsNull);
         sqlite3VdbeAddOp2(v, OP_Null, 0, target);
+        VdbeComment((v, "short-circut value"));
       }
       break;
     }