Remove an ALWAYS() macro that can in fact sometimes be false.

[forum:/forumpost/f0e872fcee|Forum post f0e872fcee].

FossilOrigin-Name: d85880e4ed89e2198beea642818051f7a91a71fea9929be0a7ed0603b493ce47

diff --git a/manifest b/manifest
index 1307580539cdf47657177499f486bb4b3efcfca7..546858402e98e9b79d122bea95762dd8c7dc855f 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\scompilation\sissues\sseen\swith\solder\sversions\sof\sMSVC.
-D 2023-04-27T22:17:12.102
+C Remove\san\sALWAYS()\smacro\sthat\scan\sin\sfact\ssometimes\sbe\sfalse.\n[forum:/forumpost/f0e872fcee|Forum\spost\sf0e872fcee].
+D 2023-04-27T23:40:03.444
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -703,7 +703,7 @@ F src/upsert.c 5303dc6c518fa7d4b280ec65170f465c7a70b7ac2b22491598f6d0b4875b3145
 F src/utf.c ee39565f0843775cc2c81135751ddd93eceb91a673ea2c57f61c76f288b041a0
 F src/util.c b1d8d87c4c8c77e70f48c43f91444fd66d91532693573b70b837afd572010176
 F src/vacuum.c 84ce7f01f8a7a08748e107a441db83bcec13970190ddcb0c9ff522adbc1c23fd
-F src/vdbe.c 1d3e3b10ce83d1470bc349e9fe842ddded303591bae4c49e3292975f3c4d9beb
+F src/vdbe.c 94d5520d2a287216c47e6fb641ee88ffd934b0d40c235d693d38bcd0e0750357
 F src/vdbe.h 637ae853b7d42ae3951034cc63ab7c8af837861f79504cdb5399552fcd89a884
 F src/vdbeInt.h a4147a4ddf613cb1bcb555ace9e9e74a9c099d65facd88155f191b1fb4d74cfb
 F src/vdbeapi.c 1a95162e26d5eda3b7b46fbe4fcbc33eb7f801529d66fc2e14c52094a5523339
@@ -2060,8 +2060,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 1eb4573e9092d350d00d05ba716cb0272e2dbb1ecbaadc2a7cc22de0b8cc2bda
-R 1210fb0fa6a88a694d8f60efc7074476
-U mistachkin
-Z e10e84fb88698cc9750bcbdb28b62bd0
+P 4ba2a651120391d779a3db9881c0fb17e1322cc9d8738f915a46e31a2f313578
+R 17f49f4919f4d8f5c0f5d76a60091614
+U drh
+Z 328809aebe8b52d41e5cb3bc142e5a4c
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index fc0f04b09646ad19f61a4f5828333772dc6e3783..a9c8c64d27013e26b5be5614b0614193472f561f 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4ba2a651120391d779a3db9881c0fb17e1322cc9d8738f915a46e31a2f313578
\ No newline at end of file
+d85880e4ed89e2198beea642818051f7a91a71fea9929be0a7ed0603b493ce47
\ No newline at end of file

diff --git a/src/vdbe.c b/src/vdbe.c
index 738596daea6c7b630aec0acb87ef924c2c023f10..ea2e6fc5b1be4f2d22e6b239d92ef8fead565729 100644 (file)
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -2745,7 +2745,7 @@ case OP_IfNullRow: {         /* jump */
   VdbeCursor *pC;
   assert( pOp->p1>=0 && pOp->p1<p->nCursor );
   pC = p->apCsr[pOp->p1];
-  if( ALWAYS(pC) && pC->nullRow ){
+  if( pC && pC->nullRow ){
     sqlite3VdbeMemSetNull(aMem + pOp->p3);
     goto jump_to_p2;
   }