Remove an unreachable branch from sqlite3SkipAccumulatorLoad().

FossilOrigin-Name: 8b9c8eab60b692e45c55a718d76b70e63040416040696907463692cbf83fb0c5

diff --git a/manifest b/manifest
index 7691a2251e6a2d0bcc581457819badeb8340649e..3592d2f2a5f3dff0a96dbd2e21e031c46f4bbed9 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Work\saround\sa\sproblem\swith\sGCC\son\s32-bit\smachines\sthat\scause\sthe\sCAST\noperator\sto\sgenerate\sa\sfloating-point\sresult\sfor\sstrings\sthat\scould\sbe\nrepresented\sas\svery\slarge\sintegers.
-D 2018-01-23T17:33:42.218
+C Remove\san\sunreachable\sbranch\sfrom\ssqlite3SkipAccumulatorLoad().
+D 2018-01-23T19:24:54.783
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 38f84f301cbef443b2d269f67a74b8cc536469831f70df7c3e912acc04932cc2
@@ -442,7 +442,7 @@ F src/delete.c 20c8788451dc737a967c87ea53ad43544d617f5b57d32ccce8bd52a0daf9e89b
 F src/expr.c 9e06de431c09f144438aa6895ea4d4290fa3c6875bfcc3ba331012ca78deadf0
 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
 F src/fkey.c d617daf66b5515e2b42c1405b2b4984c30ca50fb705ab164271a9bf66c69e331
-F src/func.c 227d17a030b75f7495fc3b8d1aca19850e794397433175c1ba21b713d9833f14
+F src/func.c 9970db37cc004136996a5c9b966b86f06583bcf3f275449b977fbb06d75e7300
 F src/global.c ac3094f1dc59fbeb919aef7cc0cc827a8459d1fb1adb7972ef75bd9e0c10b75b
 F src/hash.c a12580e143f10301ed5166ea4964ae2853d3905a511d4e0c44497245c7ce1f7a
 F src/hash.h ab34c5c54a9e9de2e790b24349ba5aab3dbb4fd4
@@ -1700,7 +1700,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 14dfd96f9bca2df5033b2d894bf63cc8bf450a45ca11df5e3bbb814fdf96b656
-R aad1a01a1cf0d877a8df52447d73431f
+P 1b02731962c21bb097a88801ece76ff441bf882519a821a246da84f4e2a33455
+R 69d183e51c910b309adf151023208c58
 U drh
-Z 57954c94bf10856d82150b78a27b3537
+Z 10ad556e955465f2ef5a7781922bad82

diff --git a/manifest.uuid b/manifest.uuid
index 8e916bf6127d592206ea118adb3d9ad6a9661eaf..4cadc19d58d7d4ad02753be2611f3baf2c03aa7a 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-1b02731962c21bb097a88801ece76ff441bf882519a821a246da84f4e2a33455
\ No newline at end of file
+8b9c8eab60b692e45c55a718d76b70e63040416040696907463692cbf83fb0c5
\ No newline at end of file

diff --git a/src/func.c b/src/func.c
index 36cfa4423084c565b6ded6ec2e0bbb5e0cdd9c58..4e80535e813ffa330fe9cbb9d57938b116fd50c8 100644 (file)
--- a/src/func.c
+++ b/src/func.c
@@ -35,7 +35,8 @@ static CollSeq *sqlite3GetFuncCollSeq(sqlite3_context *context){
 ** iteration of the aggregate loop.
 */
 static void sqlite3SkipAccumulatorLoad(sqlite3_context *context){
-  if( context->isError==0 ) context->isError = -1;
+  assert( context->isError<=0 );
+  context->isError = -1;
   context->skipFlag = 1;
 }