Due to the previous change, the p5 parameter to OP_VColumn no longer ever

contains extraneous bits, so change a testcase() into an assert() to show
as much.

FossilOrigin-Name: 5b4a88cd3b3a32b1242e0eb733cc0bc4becb830a887b8e6604a4c7452050e163

diff --git a/manifest b/manifest
index 3ee9742e6f2e90c7a8f2ae1f92aa426bb95f4cbb..d4736b0b01835d5b99b1dafa08d348f7d2e20504 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Do\snot\sset\sOP_Column\sflags\son\sthe\sinstructions\sgenerated\sby\nsqlite3ExprCodeGetColumn()\sif\sthe\sopcode\sgenerated\sis\snot\sreally\san\nOP_Column,\swhich\smight\shappen\sif\sthe\scolumn\sis\svirtual.\nFix\sfor\sticket\s[b439bfcfb7deedc6]
-D 2019-12-14T17:43:37.070
+C Due\sto\sthe\sprevious\schange,\sthe\sp5\sparameter\sto\sOP_VColumn\sno\slonger\sever\ncontains\sextraneous\sbits,\sso\schange\sa\stestcase()\sinto\san\sassert()\sto\sshow\nas\smuch.
+D 2019-12-14T18:08:22.047
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -599,7 +599,7 @@ F src/upsert.c b445315c8958d8f17ec3297d06842e61dacaad0633ccaec1e4e160de7e562212
 F src/utf.c 2f0fac345c7660d5c5bd3df9e9d8d33d4c27f366bcfb09e07443064d751a0507
 F src/util.c 2c92bc706bbdb1c45a25180291e7e05a56e297aa5dd7b2bcd2b1c47e8bb05b17
 F src/vacuum.c 82dcec9e7b1afa980288718ad11bc499651c722d7b9f32933c4d694d91cb6ebf
-F src/vdbe.c 30fc70ea7f1a47f50cd6557d8073b57fcf2275b537b896ba7e8d602065bc5648
+F src/vdbe.c 9195f2233d31c6ffca8f4a4cca67c8da0e70dab1d31a39a166bc61ecc27c18d9
 F src/vdbe.h fdbc0a11e5768a702b46ce63286f60e22e71351a29bd98b3666405e1fccc7802
 F src/vdbeInt.h bd589b8b7273286858950717e0e1ec5c88b18af45079a3366dc1371865cea704
 F src/vdbeapi.c 1252d80c548711e47a6d84dae88ed4e95d3fbb4e7bd0eaa1347299af7efddf02
@@ -1852,7 +1852,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P f8e876c82a246ceed32b166f64e05dfe5ce4ab4c6820be60404109b43d36bb80
-R 3e1bcf29405c2bc765bc5cc02f705dba
+P 2401e04730a156aa48787b91af4e516406cb7635145e430be62fd16481816237
+R 6e927ffe1bc60c5e48f827a09022214f
 U drh
-Z d5d947f7a3e61dce535fe821e852738a
+Z e4acfaf148e07535ac807ca90a087964

diff --git a/manifest.uuid b/manifest.uuid
index a22bad27d0fbe1f54f393a6e1e71333b5f1c139a..6cda21937130e32c7b2ce605a040f7d021557995 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-2401e04730a156aa48787b91af4e516406cb7635145e430be62fd16481816237
\ No newline at end of file
+5b4a88cd3b3a32b1242e0eb733cc0bc4becb830a887b8e6604a4c7452050e163
\ No newline at end of file

diff --git a/src/vdbe.c b/src/vdbe.c
index f4520c608f8196fe0d4f3cd70da3850c020be7f6..53c176b18016924fad749213b390827f9d639b4b 100644 (file)
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -7217,7 +7217,7 @@ case OP_VColumn: {
   assert( pModule->xColumn );
   memset(&sContext, 0, sizeof(sContext));
   sContext.pOut = pDest;
-  testcase( (pOp->p5 & OPFLAG_NOCHNG)==0 && pOp->p5!=0 );
+  assert( pOp->p5==OPFLAG_NOCHNG || pOp->p5==0 );
   if( pOp->p5 & OPFLAG_NOCHNG ){
     sqlite3VdbeMemSetNull(pDest);
     pDest->flags = MEM_Null|MEM_Zero;