Remove no-op code (adding an assert() to prove that the code was no-op)

in the text affinity logic of the bytecode engine comparison operators.

FossilOrigin-Name: b9f5bdbf40ac6382e48f09ebcd53cc908e065527

diff --git a/manifest b/manifest
index 40edf4512a6165bee4233d059b82ded0e51ea979..c7c8aefbf67ddf26535725e8b5be2053d64e825a 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\stypo\sin\sa\scomment\sin\ssqlite.h.in.\sNo\schanges\sto\scode.
-D 2016-09-15T05:47:00.658
+C Remove\sno-op\scode\s(adding\san\sassert()\sto\sprove\sthat\sthe\scode\swas\sno-op)\nin\sthe\stext\saffinity\slogic\sof\sthe\sbytecode\sengine\scomparison\soperators.
+D 2016-09-15T14:54:51.441
 F Makefile.in 6fd48ffcf7c2deea7499062d1f3747f986c19678
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc e1aa788e84f926e42239ee167c53f785bedacacd
@@ -453,7 +453,7 @@ F src/update.c 8179e699dbd45b92934fd02d3d8e3732e8da8802
 F src/utf.c 699001c79f28e48e9bcdf8a463da029ea660540c
 F src/util.c 810ec3f22e2d1b62e66c30fe3621ebdedd23584d
 F src/vacuum.c 913970b9d86dd6c2b8063ef1af421880f1464ec3
-F src/vdbe.c bac0b2ed0ceb7efcbfb1a3c0731937c23a5ddfc8
+F src/vdbe.c 31a17090bf658c1e6ba4e58f7a08e8ce4c2e7d7f
 F src/vdbe.h 67bc551f7faf04c33493892e4b378aada823ed10
 F src/vdbeInt.h c59381049af5c7751a83456c39b80d1a6fde1f9d
 F src/vdbeapi.c a32d61b7dd05e6890d8fd44d2805f55e2f5ba9f3
@@ -1525,7 +1525,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 5990a1bdb4a0734ff23015ada71cf02d0cb1381f
-R b4583e048ef3b20a2bc8fdee50fd352e
-U dan
-Z 612771189b9f1d70deeb6e8a6f7394ca
+P 12df7152109ffce4b3e0ee233c5ea8103edb902a
+R 6b884a026aa6fc5e3121f8fd54dbd58f
+U drh
+Z a5246499f87a7576d63b6cd54f036979

diff --git a/manifest.uuid b/manifest.uuid
index 27bca0b9ff69fc2dc66f00143be9ace5143b8443..6179fb4208f3b70fd90a49212331214b4d3d1b35 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-12df7152109ffce4b3e0ee233c5ea8103edb902a
\ No newline at end of file
+b9f5bdbf40ac6382e48f09ebcd53cc908e065527
\ No newline at end of file

diff --git a/src/vdbe.c b/src/vdbe.c
index 63b78697a7c69ad2f76a2f57d40675896575f42f..552da6fd96b36b086ce22eee0db16c14ead1c801 100644 (file)
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -2057,8 +2057,7 @@ case OP_Ge: {             /* same as TK_GE, jump, in1, in3 */
         sqlite3VdbeMemStringify(pIn1, encoding, 1);
         testcase( (flags1&MEM_Dyn) != (pIn1->flags&MEM_Dyn) );
         flags1 = (pIn1->flags & ~MEM_TypeMask) | (flags1 & MEM_TypeMask);
-        testcase( flags3!=pIn3->flags ); /* Possible if pIn1==pIn3 */
-        flags3 = pIn3->flags;
+        assert( pIn1!=pIn3 );
       }
       if( (flags3 & MEM_Str)==0 && (flags3 & (MEM_Int|MEM_Real))!=0 ){
         testcase( pIn3->flags & MEM_Int );