Simplified alignment constraints in the memory reuse logic of

sqlite3VdbeMakeReady().

FossilOrigin-Name: e998513e442ce1206b12dc28bdc996d7b5f9f94d

diff --git a/manifest b/manifest
index 04d3534b4d509ac54d297f6119668f278351dfe9..8ac154c64cb1618f5e6ef899d82ffe52c6629afb 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sthe\sexperimental\ssnapshot\sinterface.\s\sBecause\sit\sis\sexperimental,\sit\sis\nsubject\sto\schange\sor\sremoval\sat\sa\slater\sdate.
-D 2015-12-11T12:44:52.505
+C Simplified\salignment\sconstraints\sin\sthe\smemory\sreuse\slogic\sof\nsqlite3VdbeMakeReady().
+D 2015-12-11T13:51:02.921
 F Makefile.in 28bcd6149e050dff35d4dcfd97e890cd387a499d
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc e8fdca1cb89a1b58b5f4d3a130ea9a3d28cb314d
@@ -408,7 +408,7 @@ F src/vdbe.c 4d75375fa8bf911aa76ab8383d6f7eea0dec0fda
 F src/vdbe.h efb7a8c1459e31f3ea4377824c6a7e4cb5068637
 F src/vdbeInt.h 75c2e82ee3357e9210c06474f8d9bdf12c81105d
 F src/vdbeapi.c 020681b943e77766b32ae1cddf86d7831b7374ca
-F src/vdbeaux.c 864b9ec26adca0562a32fb8dee7b0b366304bfd9
+F src/vdbeaux.c 68082d9991fc1b8625d34c8b5db1775c9dee426e
 F src/vdbeblob.c fdc4a81605ae7a35ae94a55bd768b66d6be16f15
 F src/vdbemem.c fdd1578e47bea61390d472de53c565781d81e045
 F src/vdbesort.c a7ec02da4494c59dfd071126dd3726be5a11459d
@@ -1410,8 +1410,7 @@ F tool/vdbe_profile.tcl 246d0da094856d72d2c12efec03250d71639d19f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 96d3e99ffe59b5280b8b7fc269c94a72e15c345b 843c15a552657ca43ff200edb7da7566752d7941
-R 1e8a48e65f87836435758a04b37e3926
-T +closed 843c15a552657ca43ff200edb7da7566752d7941
+P 9b124a5a310aec0145495c9980bc0c1308fcca02
+R 8b7bf5c5d9b6c5d6524021fe34935458
 U drh
-Z f796eddbea3599c0fdbed9d3e73688d6
+Z 8b682652b257be08de396beec767150c

diff --git a/manifest.uuid b/manifest.uuid
index bcf7d5193b2a076a173d89a33a876ccefb63ee2e..8c6ba19c4c6d4f08bb185c76ee94272d3f190c2e 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-9b124a5a310aec0145495c9980bc0c1308fcca02
\ No newline at end of file
+e998513e442ce1206b12dc28bdc996d7b5f9f94d
\ No newline at end of file

diff --git a/src/vdbeaux.c b/src/vdbeaux.c
index 8361680b746d96de24d8724516c9982adf57c583..a266177ac561c79819640b4f3d0b7e8583905480 100644 (file)
--- a/src/vdbeaux.c
+++ b/src/vdbeaux.c
@@ -1859,9 +1859,7 @@ void sqlite3VdbeMakeReady(
     nMem = 10;
   }
   memset(zCsr, 0, nFree);
-  nFree -= (zCsr - (u8*)0)&7;
-  zCsr += (zCsr - (u8*)0)&7;
-  assert( EIGHT_BYTE_ALIGNMENT(zCsr) );
+  assert( EIGHT_BYTE_ALIGNMENT(&zCsr[nFree]) );
   p->expired = 0;
 
   /* Memory for registers, parameters, cursor, etc, is allocated in two