Remove a conditional made unreachable by the previous ExprList enhancement.

FossilOrigin-Name: a1cf44763277b6c745b5b5509ca9129b6c3231608b4d1c8aec2815b64b5a2a07

diff --git a/manifest b/manifest
index 3ba9e765b9785a28830b5848fb21cafefd631a46..461907577322297d730a0770732e6ce5d527f405 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Combine\sthe\sExprList_item\sobjects\sand\sthe\sExprList\swrapper\sinto\sa\ssingle\nmemory\sallocation,\sfor\simproved\sperformance\sand\sreduced\sfootprint.
-D 2017-04-05T11:32:13.794
+C Remove\sa\sconditional\smade\sunreachable\sby\sthe\sprevious\sExprList\senhancement.
+D 2017-04-05T11:49:06.526
 F Makefile.in 1cc758ce3374a32425e4d130c2fe7b026b20de5b8843243de75f087c0a2661fb
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc a4c0613a18663bda56d8cf76079ab6590a7c3602e54befb4bbdef76bcaa38b6a
@@ -354,7 +354,7 @@ F src/ctime.c 47d91a25ad8f199a71a5b1b7b169d6dd0d6e98c5719eca801568798743d1161c
 F src/date.c ee676e7694dfadbdd2fde1a258a71be8360ba5ae
 F src/dbstat.c 19ee7a4e89979d4df8e44cfac7a8f905ec89b77d
 F src/delete.c 0d9d5549d42e79ce4d82ff1db1e6c81e36d2f67c
-F src/expr.c 6b186566a120d7d0aa4d0a846d9500704a22530f8f1c216185629dd8aee17743
+F src/expr.c d6b2f5ffa944b6ca950db65b572256e6148496bfc779c09b9e9488b8eebc93c2
 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
 F src/fkey.c 2e9aabe1aee76273aff8a84ee92c464e095400ae
 F src/func.c 9d52522cc8ae7f5cdadfe14594262f1618bc1f86083c4cd6da861b4cf5af6174
@@ -1570,7 +1570,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 71ed35ccf7c0f6c49118a44cf6621f46b9ea883e4a74d51b8b1ade6d9a95413a
-R 35ab32fb0c98cf97e1b56263304a8725
+P 2b6560ad88b92820c383bcdc1e30c06f8b081ef7c6d9b1af71d2bb76c83e35cd
+R 812df0359506624ef6f94f0149739746
 U drh
-Z 9400dede22aec4be5e7e28c14dab8209
+Z 9b5482ae695747ea67bbfbf192e444a1

diff --git a/manifest.uuid b/manifest.uuid
index 7d4e9ca8269e35b6eb21af26c37ecf439d29730f..a97fdbfc7fa8f57a74bbcf72b5ad2687342e143f 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-2b6560ad88b92820c383bcdc1e30c06f8b081ef7c6d9b1af71d2bb76c83e35cd
\ No newline at end of file
+a1cf44763277b6c745b5b5509ca9129b6c3231608b4d1c8aec2815b64b5a2a07
\ No newline at end of file

diff --git a/src/expr.c b/src/expr.c
index 8d935764ac79bb3054cbe0d9a3fe5fc0c2bb27d1..20ccea787c4e49175e2af17d0b21d314ca17a806 100644 (file)
--- a/src/expr.c
+++ b/src/expr.c
@@ -1550,20 +1550,19 @@ ExprList *sqlite3ExprListAppendVector(
     }
   }
 
-  if( pExpr->op==TK_SELECT ){
-    if( pList && pList->a[iFirst].pExpr ){
-      Expr *pFirst = pList->a[iFirst].pExpr;
-      assert( pFirst->op==TK_SELECT_COLUMN );
+  if( pExpr->op==TK_SELECT && pList ){
+    Expr *pFirst = pList->a[iFirst].pExpr;
+    assert( pFirst!=0 );
+    assert( pFirst->op==TK_SELECT_COLUMN );
      
-      /* Store the SELECT statement in pRight so it will be deleted when
-      ** sqlite3ExprListDelete() is called */
-      pFirst->pRight = pExpr;
-      pExpr = 0;
-
-      /* Remember the size of the LHS in iTable so that we can check that
-      ** the RHS and LHS sizes match during code generation. */
-      pFirst->iTable = pColumns->nId;
-    }
+    /* Store the SELECT statement in pRight so it will be deleted when
+    ** sqlite3ExprListDelete() is called */
+    pFirst->pRight = pExpr;
+    pExpr = 0;
+
+    /* Remember the size of the LHS in iTable so that we can check that
+    ** the RHS and LHS sizes match during code generation. */
+    pFirst->iTable = pColumns->nId;
   }
 
 vector_append_error: