Change an unreachable branch into an assert().

FossilOrigin-Name: 778e57a558dc3f819ca57623bcb85f58c8fbeb28bc12a1e2edbdd1244e9107c5

diff --git a/manifest b/manifest
index dd38d6bca19c1863e65802abadcebcee9fb62f88..3f8f2e4399814fc45fc1552c230b42423bc73a1a 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Transitive\sequality\sconstriants\sdo\snot\swork\son\sa\sRIGHT\sJOIN,\ssince\sthe\nright-hand\sside\smight\sbe\sa\snon-matched\srow.
-D 2022-05-13T20:11:32.182
+C Change\san\sunreachable\sbranch\sinto\san\sassert().
+D 2022-05-13T23:01:28.631
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -504,7 +504,7 @@ F src/date.c 15082566229d4b1e5f24fdb490bf9bcc68824b911d70e3573ef075a1b9e2d26f
 F src/dbpage.c 90661a87e1db8bfbc8d2ebbdcd3749651ddb287c555c07a28fb17c7c591ffb68
 F src/dbstat.c 861e08690fcb0f2ee1165eff0060ea8d4f3e2ea10f80dab7d32ad70443a6ff2d
 F src/delete.c a8e844af211a48b13b5b358be77a12c860c6a557c21990ad51a548e2536500ce
-F src/expr.c b4328d113e600cf99897d32d733b3db7e6c46689adf6745bd3a1d88f7eb4d613
+F src/expr.c 19507ae3244402860cac2944be3b92bf9a8b50212fbfabaf7e9817127fec7c00
 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
 F src/fkey.c d965ede15d8360c09ed59348940649ee647b192e784466837d7aefa836d1d91e
 F src/func.c a3407a6fbb0d4088d8d502e46f0ace63e0aeae7467ae23a9ca9815bbf9239761
@@ -1954,8 +1954,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 12ee29d632ae4b585ef6bc07d3289d00c121268945dffd5673b251d95874e3f8
-R 3b32753c02e0328fbac2d9ecf908b93f
+P 0f96810b840dd6f209562635b21f55a7ed6210c01336fcfeb3b79e08a615a28d
+R 8c1b51d90f1ade9d0405d38079e89004
 U drh
-Z 14b7465680d1bfc87bc9e1512c0fb518
+Z 3783ffda9c8935c9c4c32a5060a3eb20
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 88414818121d2c4b43cf42e1d262f378bec12894..1270c03081921b37b29ab1246246ca1d6768ed94 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-0f96810b840dd6f209562635b21f55a7ed6210c01336fcfeb3b79e08a615a28d
\ No newline at end of file
+778e57a558dc3f819ca57623bcb85f58c8fbeb28bc12a1e2edbdd1244e9107c5
\ No newline at end of file

diff --git a/src/expr.c b/src/expr.c
index b7e6c25fa5e47846ecd2429ae1fcfc0992c0f3b6..93b23049dfc76df076a8c74a721be0f12b02e600 100644 (file)
--- a/src/expr.c
+++ b/src/expr.c
@@ -3080,9 +3080,8 @@ void sqlite3CodeRhsOfIN(
       assert( ExprUseYSub(pExpr) );
       sqlite3VdbeAddOp2(v, OP_Gosub, pExpr->y.sub.regReturn,
                         pExpr->y.sub.iAddr);
-      if( iTab!=pExpr->iTable ){
-        sqlite3VdbeAddOp2(v, OP_OpenDup, iTab, pExpr->iTable);
-      }
+      assert( iTab!=pExpr->iTable );
+      sqlite3VdbeAddOp2(v, OP_OpenDup, iTab, pExpr->iTable);
       sqlite3VdbeJumpHere(v, addrOnce);
       return;
     }