Further minor enhancement and size reduction in

sqlite3ExprAssignVarNumber().

FossilOrigin-Name: eacfdcf25796ea29b5e63499c3d7397498305ad9

diff --git a/manifest b/manifest
index 96a31247b7e4258de744444b4fe1eb1f2deb87fe..5c0df4b7d444718dbb3b024c1abe0127b8d98c0d 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Performance\soptimization\sin\ssqlite3ExprAssignVarNumber().
-D 2017-01-31T03:52:34.839
+C Further\sminor\senhancement\sand\ssize\sreduction\sin\s\nsqlite3ExprAssignVarNumber().
+D 2017-01-31T12:41:48.800
 F Makefile.in 5f415e7867296d678fed2e6779aea10c1318b4bc
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc b8ca53350ae545e3562403d5da2a69cec79308da
@@ -344,7 +344,7 @@ F src/ctime.c 9f2296a4e5d26ebf0e0d95a0af4628f1ea694e7a
 F src/date.c dc3f1391d9297f8c748132813aaffcb117090d6e
 F src/dbstat.c 19ee7a4e89979d4df8e44cfac7a8f905ec89b77d
 F src/delete.c 0d9d5549d42e79ce4d82ff1db1e6c81e36d2f67c
-F src/expr.c 27ac552489a34fc85202084dda32d0a2a0664bfb
+F src/expr.c d7ef6fdb70bc18259d7d36b22aa0bc4845c5c5b9
 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
 F src/fkey.c 2e9aabe1aee76273aff8a84ee92c464e095400ae
 F src/func.c c67273e1ec08abbdcc14c189892a3ff6eeece86b
@@ -1548,7 +1548,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 e93d2c49a44af994ff10cc9cc7eafacd5a4f73ab
-R e1972f457267c7c1c09dde68002ccdbd
+P 5987ca1ff94ed3c1666f783bb15b16158aa7e1db
+R 877cd166cfa1886b85d3c173dceec467
 U drh
-Z 4723986ca78be7a36581ca020c177062
+Z 12e7b02d2001dbb9bba0a7e780630702

diff --git a/manifest.uuid b/manifest.uuid
index 5663814ec33f66669abecf185c77499f202c598c..e94ba71f966acd77810fb1c8d3a8888cf6d3bafc 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5987ca1ff94ed3c1666f783bb15b16158aa7e1db
\ No newline at end of file
+eacfdcf25796ea29b5e63499c3d7397498305ad9
\ No newline at end of file

diff --git a/src/expr.c b/src/expr.c
index 9bf893676551efbfc67b428c2cdd35191e176755..18035bd421aa37c8455c71e6555a9e1d3388194c 100644 (file)
--- a/src/expr.c
+++ b/src/expr.c
@@ -974,7 +974,6 @@ void sqlite3ExprAssignVarNumber(Parse *pParse, Expr *pExpr, u32 n){
       }else{
         bOk = 0==sqlite3Atoi64(&z[1], &i, n-1, SQLITE_UTF8);
       }
-      x = (ynVar)i;
       testcase( i==0 );
       testcase( i==1 );
       testcase( i==db->aLimit[SQLITE_LIMIT_VARIABLE_NUMBER]-1 );
@@ -984,6 +983,7 @@ void sqlite3ExprAssignVarNumber(Parse *pParse, Expr *pExpr, u32 n){
             db->aLimit[SQLITE_LIMIT_VARIABLE_NUMBER]);
         return;
       }
+      x = (ynVar)i;
       if( x>pParse->nVar ){
         pParse->nVar = (int)x;
         doAdd = 1;