From: drh <drh@noemail.net>
Date: Sat, 30 Apr 2016 18:10:34 +0000 (+0000)
Subject: Remove an unnecessary branch from the OP_String8 opcode.
X-Git-Tag: version-3.13.0~49
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2f55511dfa0ff9ad1c82a918ea62a7be236420cb;p=thirdparty%2Fsqlite.git

Remove an unnecessary branch from the OP_String8 opcode.

FossilOrigin-Name: 459a0b456da69112605b37adc9af27d79e35a4d7
---

diff --git a/manifest b/manifest
index c82cd48e76..fe30409fc4 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C More\sbug\sfixes\sto\sLemon\sidentified\sby\sKelvin\sSherlock.\s\sNone\sof\sthese\nhave\sany\simpact\son\sSQLite.
-D 2016-04-30T17:19:30.162
+C Remove\san\sunnecessary\sbranch\sfrom\sthe\sOP_String8\sopcode.
+D 2016-04-30T18:10:34.585
 F Makefile.in 9e816d0323e418fbc0f8b2c05fc14e0b3763d9e8
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 71b8b16cf9393f68e2e2035486ca104872558836
@@ -443,7 +443,7 @@ F src/update.c 3e67ab3c0814635f355fb1f8ab010a2b9e016e7d
 F src/utf.c 699001c79f28e48e9bcdf8a463da029ea660540c
 F src/util.c 810ec3f22e2d1b62e66c30fe3621ebdedd23584d
 F src/vacuum.c feb1eabb20987983d9350cad98299b21fa811f52
-F src/vdbe.c b2067cd06a0f30a6dea865f93c690df15e0314a8
+F src/vdbe.c 465bb820f9760602959ba8d279cdae621206d696
 F src/vdbe.h 5591b5add447096e31288b5a0a78ec5d7b5c5170
 F src/vdbeInt.h ddb157974436d87652de7dc641f7191496d9a8cd
 F src/vdbeapi.c ba85b78fe08dc4a9ce747e62c89a2b4a4547e74c
@@ -1486,7 +1486,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 daf4630f96f13133664908045e279da9d5a40bb5
-R abf1ac3c7e03f177ba74945ccc38d922
+P 762bdc55f8878ee2ef65af2165a8e7fdbddf0160
+R c6bd6d9832f41be3a84777fb9beacd97
 U drh
-Z cfd7bc89828187e9540e8e1e6f984687
+Z beaad3433e5488a905014b307adfe5b7
diff --git a/manifest.uuid b/manifest.uuid
index 03d710e202..c3f171f13c 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-762bdc55f8878ee2ef65af2165a8e7fdbddf0160
\ No newline at end of file
+459a0b456da69112605b37adc9af27d79e35a4d7
\ No newline at end of file
diff --git a/src/vdbe.c b/src/vdbe.c
index cb977e0854..469ab86e42 100644
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -1064,10 +1064,7 @@ case OP_String8: {         /* same as TK_STRING, out2 */
 #ifndef SQLITE_OMIT_UTF16
   if( encoding!=SQLITE_UTF8 ){
     rc = sqlite3VdbeMemSetStr(pOut, pOp->p4.z, -1, SQLITE_UTF8, SQLITE_STATIC);
-    if( rc ){
-      assert( rc==SQLITE_TOOBIG ); /* This is the only possible error here */
-      goto too_big;
-    }
+    assert( rc==SQLITE_OK || rc==SQLITE_TOOBIG );
     if( SQLITE_OK!=sqlite3VdbeChangeEncoding(pOut, encoding) ) goto no_mem;
     assert( pOut->szMalloc>0 && pOut->zMalloc==pOut->z );
     assert( VdbeMemDynamic(pOut)==0 );
@@ -1080,10 +1077,12 @@ case OP_String8: {         /* same as TK_STRING, out2 */
     pOp->p4.z = pOut->z;
     pOp->p1 = pOut->n;
   }
+  testcase( rc==SQLITE_TOOBIG );
 #endif
   if( pOp->p1>db->aLimit[SQLITE_LIMIT_LENGTH] ){
     goto too_big;
   }
+  assert( rc==SQLITE_OK );
   /* Fall through to the next case, OP_String */
 }