From: drh <>
Date: Wed, 24 Sep 2025 16:26:44 +0000 (+0000)
Subject: Simplification to the AND/OR short-circuit logic.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fheads%2Fshort-circuit;p=thirdparty%2Fsqlite.git

Simplification to the AND/OR short-circuit logic.

FossilOrigin-Name: 7be555a3b8500c43c2f30171af26bcda9bcb68f41992b792228218a56315e7c4
---

diff --git a/manifest b/manifest
index e0c48d5669..9c5fcf13e2 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fixes\sto\sshort-circuit\sAND/OR\sevaluation.
-D 2025-09-24T14:43:42.310
+C Simplification\sto\sthe\sAND/OR\sshort-circuit\slogic.
+D 2025-09-24T16:26:44.669
 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@ -693,7 +693,7 @@ F src/date.c b6f92001f4b1f73f21774927488661d28f4dac9cd9701ed96486d96b44f5b058
 F src/dbpage.c 081c59d84f187aa0eb48d98faf9578a00bde360f68438d646a86b618653d2479
 F src/dbstat.c 73362c0df0f40ad5523a6f5501224959d0976757b511299bf892313e79d14f5c
 F src/delete.c 03a77ba20e54f0f42ebd8eddf15411ed6bdb06a2c472ac4b6b336521bf7cea42
-F src/expr.c 0746e286897020cf36ccb09713f43151a5f9ce8f208f0ae3b32fe42908f096c2
+F src/expr.c aae36a5fbd17e256caf37b03bdaf4d27fd080d83578953c746d542340b37457e
 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
 F src/fkey.c 928ed2517e8732113d2b9821aa37af639688d752f4ea9ac6e0e393d713eeb76f
 F src/func.c de47a8295503aa130baae5e6d9868ecf4f7c4dbffa65d83ad1f70bdbac0ee2d6
@@ -2175,8 +2175,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 cab84a65c3825c59f3a7a750f4983563ce7ad007125cbcf35c187326289fea89
-R 249976bcbb8ead84fd46ece0ea605849
+P bc4cadbd60b97d000d2e8be843acab9d82ddf10a8125fd9cc0ae101bb9850091
+R da6e5b070e35005c40ada7c6db13f0d7
 U drh
-Z ac1897a73ee8a49c86d6ce76056d5c1b
+Z 8e7a2ff6758ee964c0bf2805d03c5e38
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 53d156157c..2f7cf5023c 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-bc4cadbd60b97d000d2e8be843acab9d82ddf10a8125fd9cc0ae101bb9850091
+7be555a3b8500c43c2f30171af26bcda9bcb68f41992b792228218a56315e7c4
diff --git a/src/expr.c b/src/expr.c
index c464fd851d..ad48c35f42 100644
--- a/src/expr.c
+++ b/src/expr.c
@@ -4872,14 +4872,10 @@ static SQLITE_NOINLINE int exprCodeTargetAndOr(
   }
   sqlite3VdbeAddOp3(v, op, r2, r1, target);
   testcase( (*pTmpReg)==0 );
-  if( addrSkip==0 ){
-    /* no-op */
-  }else if( regSS==target ){
-    sqlite3VdbeJumpHere(v, addrSkip);
-  }else{
+  if( addrSkip ){
     sqlite3VdbeAddOp2(v, OP_Goto, 0, sqlite3VdbeCurrentAddr(v)+2);
     sqlite3VdbeJumpHere(v, addrSkip);
-    sqlite3VdbeAddOp3(v, OP_Move, regSS, target, 1);
+    sqlite3VdbeAddOp3(v, OP_Or, regSS, regSS, target);
     VdbeComment((v, "short-circut value"));
   }
   return target;