commit 92a27f7bf2866cf2b99713559b39e1e725b489bd
author drh <drh@noemail.net> Tue Feb 04 01:41:44 2020
committer drh <drh@noemail.net> Tue Feb 04 01:41:44 2020
tree f4c6a1357abcf8460577cce78443578032333e74
parent 40d1db8d20ed664abd7303f9ed1cd15f437ddd54

Extend the OP_Copy-coalesce optimization fix of check-in [b36126c1889e323c]
so that it is also correctly disabled by the CASE operator.
Ticket [9d3666754ac37d5a].

FossilOrigin-Name: 29a969d6b1709b80d9cb88b60971e4eb021f7f5f8ee9a619be74b833a78a35ef

manifest

diff --git a/manifest b/manifest
index e896cf4..271081c 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sproblem\swith\sthe\sbyte-code\sdecompiler\sthat\swas\sinserted\sby\sthe\nenhancements\sat\s[4248980a356f659b]
-D 2020-02-04T00:55:27.137
+C Extend\sthe\sOP_Copy-coalesce\soptimization\sfix\sof\scheck-in\s[b36126c1889e323c]\nso\sthat\sit\sis\salso\scorrectly\sdisabled\sby\sthe\sCASE\soperator.\nTicket\s[9d3666754ac37d5a].
+D 2020-02-04T01:41:44.382
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -483,7 +483,7 @@
 F src/dbpage.c 8a01e865bf8bc6d7b1844b4314443a6436c07c3efe1d488ed89e81719047833a
 F src/dbstat.c 0f55297469d4244ab7df395849e1af98eb5e95816af7c661e7d2d8402dea23da
 F src/delete.c a5c59b9c0251cf7682bc52af0d64f09b1aefc6781a63592c8f1136f7b73c66e4
-F src/expr.c 003c59158b33d7f3b198122cb0d1e13c06517cc3932e56b42283eb0e96696d66
+F src/expr.c 6617ca8d4cc808b82348ae0c2844000b665de86aacc60fa0524f1b29b1918921
 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
 F src/fkey.c 92a248ec0fa4ed8ab60c98d9b188ce173aaf218f32e7737ba77deb2a684f9847
 F src/func.c 108577cebe8a50c86d849a93b99493a54e348dd0b846f00d13b52ca973d5baf4
@@ -1858,7 +1858,7 @@
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 0ea2dbfc9088561d62c3456803cb08d357e4e60f1d21f6ed37315564be4957d3
-R a14cfc41ee4ece6f232257046b936365
+P af63e95dcdd6e9741cdddc3698e857e3b8be40048d3036f939f3583e517c4eff
+R 38e3ff71fea898ad6724ce3564821643
 U drh
-Z 5e1934dfa02991667f95c2767a706795
+Z 0356372c288c0543cb385710a3405d49

manifest.uuid

diff --git a/manifest.uuid b/manifest.uuid
index 90f7810..80c6fa2 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-af63e95dcdd6e9741cdddc3698e857e3b8be40048d3036f939f3583e517c4eff
\ No newline at end of file
+29a969d6b1709b80d9cb88b60971e4eb021f7f5f8ee9a619be74b833a78a35ef
\ No newline at end of file

src/expr.c

diff --git a/src/expr.c b/src/expr.c
index d82ef8b..46a3f9f 100644
--- a/src/expr.c
+++ b/src/expr.c
@@ -3638,6 +3638,16 @@
 }
 
 /*
+** If the last opcode is a OP_Copy, then set the do-not-merge flag (p5)
+** so that a subsequent copy will not be merged into this one.
+*/
+static void setDoNotMergeFlagOnCopy(Vdbe *v){
+  if( sqlite3VdbeGetOp(v, -1)->opcode==OP_Copy ){
+    sqlite3VdbeChangeP5(v, 1);  /* Tag trailing OP_Copy as not mergable */
+  }
+}
+
+/*
 ** Generate code to implement special SQL functions that are implemented
 ** in-line rather than by using the usual callbacks.
 */
@@ -3668,9 +3678,7 @@
         VdbeCoverage(v);
         sqlite3ExprCode(pParse, pFarg->a[i].pExpr, target);
       }
-      if( sqlite3VdbeGetOp(v, -1)->opcode==OP_Copy ){
-        sqlite3VdbeChangeP5(v, 1);  /* Tag trailing OP_Copy as not mergable */
-      }
+      setDoNotMergeFlagOnCopy(v);
       sqlite3VdbeResolveLabel(v, endCoalesce);
       break;
     }
@@ -4441,6 +4449,7 @@
         sqlite3VdbeAddOp2(v, OP_Null, 0, target);
       }
       sqlite3ExprDelete(db, pDel);
+      setDoNotMergeFlagOnCopy(v);
       sqlite3VdbeResolveLabel(v, endLabel);
       break;
     }