Work around a bug in GCC. Ticket #2469. (CVS 4173)

FossilOrigin-Name: 1924ba5207bdc8d503c17cd9460c1a9f9c357635

diff --git a/manifest b/manifest
index 88a61d0e3af89d7f50d359dae426756d7c7fc292..ca6c2fe4ed9a751fc83056bc69062235835a52ec 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Work\saround\san\sAFP\sfile\ssystem\sbyte-range\slocking\serror\scaused\sby\sopening\sand\sclosing\sa\ssecond\sfile\sdescriptor\son\sthe\sdatabase\sfile\sas\sRDWR\swhich\sclears\sthe\sexclusive\sbyte-range\slock\sand\sresults\sin\san\sfcntl\serror\swhen\sthe\sAFP\slocking\scode\sattempts\sto\sclear\sit\safterwards.\s\sThis\serror\sis\scaused\sby\sthe\stest\sharness\sand\sisn't\sa\sflaw\sin\sthe\ssqlite\sor\sits\simplementation\sof\sAFP\sfile\slocking.\s(CVS\s4172)
-D 2007-07-20T20:25:38
+C Work\saround\sa\sbug\sin\sGCC.\s\sTicket\s#2469.\s(CVS\s4173)
+D 2007-07-21T19:41:46
 F Makefile.in 0c0e53720f658c7a551046442dd7afba0b72bfbe
 F Makefile.linux-gcc 65241babba6faf1152bf86574477baab19190499
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -140,7 +140,7 @@ F src/update.c 6b10becb6235ea314ed245fbfbf8b38755e3166e
 F src/utf.c 01b2aba02b10d12903e9e1ff897215c9faf6b662
 F src/util.c 9e81d417fc60bd2fe156f8f2317aa4845bc6cc90
 F src/vacuum.c 8bd895d29e7074e78d4e80f948e35ddc9cf2beef
-F src/vdbe.c a96ce3799f037b8f4e185a01823072320fd9ccb3
+F src/vdbe.c 033d1e6b5a8c0e3c00814be511794bc0bba65a9f
 F src/vdbe.h 001c5b257567c1d3de7feb2203aac71d0d7b16a3
 F src/vdbeInt.h c3514903cad9e36d6b3242be20261351d09db56c
 F src/vdbeapi.c fe3b713d5d37f8dfff1aa7546dae213a0e492f10
@@ -520,7 +520,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P e269f6e9f6273210259a488c356f4996d75c6436
-R 7b6e3a55107b11156db70c2325cd0bc7
-U aswift
-Z 02d988ee93c619bd2875987f1ccb8b11
+P b2ba3e81fb1015d6f979a490e00a45fb7d5e1a9a
+R 98e7d4563683ff4f0fd6aaa8c5f897e7
+U drh
+Z c1549627a310aa52c2312d26c9b8db66

diff --git a/manifest.uuid b/manifest.uuid
index f09c2bb212512459e5a48580d1afafe5ea985d91..2ac4947399fec96882d7b34e168123560a28bc85 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b2ba3e81fb1015d6f979a490e00a45fb7d5e1a9a
\ No newline at end of file
+1924ba5207bdc8d503c17cd9460c1a9f9c357635
\ No newline at end of file

diff --git a/src/vdbe.c b/src/vdbe.c
index 7efc80365f6a5d5112cd1396d0579f2dfa497fa3..aa1ab0ab861e2b2d67fee9fafd1c56fe99d35b8c 100644 (file)
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -43,7 +43,7 @@
 ** in this file for details.  If in doubt, do not deviate from existing
 ** commenting and indentation practices when changing or adding code.
 **
-** $Id: vdbe.c,v 1.636 2007/07/01 21:18:40 drh Exp $
+** $Id: vdbe.c,v 1.637 2007/07/21 19:41:46 drh Exp $
 */
 #include "sqliteInt.h"
 #include "os.h"
@@ -4306,7 +4306,7 @@ case OP_IntegrityCk: {
   pnErr = &p->aMem[j];
   assert( (pnErr->flags & MEM_Int)!=0 );
   for(j=0; j<nRoot; j++){
-    aRoot[j] = pTos[-j].u.i;
+    aRoot[j] = (pTos-j)->u.i;
   }
   aRoot[j] = 0;
   popStack(&pTos, nRoot);