Work around an optimization issue with the MSVC compiler for ARM.

FossilOrigin-Name: 2ce625fdbee78b2acbe3aa19b01ff92241c0d598

diff --git a/manifest b/manifest
index 58a7eadb35f31242f29e676577e9aeab12599329..44e26200ec0fe040927137010bf25a70e0f2f95e 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C A\sbranch\soff\sof\sthe\ssessions\sbranch\scorresponding\sto\srelease\s3.7.14.
-D 2012-10-03T18:20:02.748
+C Work\saround\san\soptimization\sissue\swith\sthe\sMSVC\scompiler\sfor\sARM.
+D 2012-10-03T18:26:39.323
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in abd5c10d21d1395f140d9e50ea999df8fa4d6376
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -135,7 +135,7 @@ F src/auth.c 523da7fb4979469955d822ff9298352d6b31de34
 F src/backup.c 5b31b24d6814b11de763debf342c8cd0a15a4910
 F src/bitvec.c 26675fe8e431dc555e6f2d0e11e651d172234aa1
 F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7
-F src/btree.c 9cf6de113d23d47967df24b8d8ce6501c879d7e6
+F src/btree.c 97edf88abd2b66f31886ba977d2b3b2a21d81d4c
 F src/btree.h 4aee02e879211bfcfd3f551769578d2e940ab6c2
 F src/btreeInt.h 4e5c2bd0f9b36b2a815a6d84f771a61a65830621
 F src/build.c a3b700afd475e6387da59be6f2e86161e80d6d87
@@ -1027,10 +1027,7 @@ F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/win/sqlite.vsix 67d8a99aceb56384a81b3f30d6c71743146d2cc9
-P 87995dc9409482f0a7a367bfc51d78ac0f63b8c3 c0d89d4a9752922f9e367362366efde4f1b06f2a
-R 324a519d6f898776b9a8c9b806b32640
-T *branch * sessions-3.7.14
-T *sym-sessions-3.7.14 *
-T -sym-sessions *
+P 86633e01fec2cbc00c749f6ef6ecda6acad2a82e
+R e98c79d5113be3b6fac2b737f0b78828
 U drh
-Z 5c9e19dba4e39e94fc2ae70cd9d636ab
+Z 583a5f488427cc9879b99281d52c2986

diff --git a/manifest.uuid b/manifest.uuid
index f28e0fd8ba29b59feec5e4386745ad80651405ef..8d28855609717748038fab924b1438efe70fb7f4 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-86633e01fec2cbc00c749f6ef6ecda6acad2a82e
\ No newline at end of file
+2ce625fdbee78b2acbe3aa19b01ff92241c0d598
\ No newline at end of file

diff --git a/src/btree.c b/src/btree.c
index 47dd7db99da35b764dc425ab02a9696ea139cbdb..d34d6ee0b19937321ba0cda9efb3ef3badc02db2 100644 (file)
--- a/src/btree.c
+++ b/src/btree.c
@@ -5922,6 +5922,9 @@ static void copyNodeContent(MemPage *pFrom, MemPage *pTo, int *pRC){
 ** If aOvflSpace is set to a null pointer, this function returns 
 ** SQLITE_NOMEM.
 */
+#if defined(_MSC_VER) && _MSC_VER >= 1700 && defined(_M_ARM)
+#pragma optimize("", off)
+#endif
 static int balance_nonroot(
   MemPage *pParent,               /* Parent page of siblings being balanced */
   int iParentIdx,                 /* Index of "the page" in pParent */
@@ -6552,6 +6555,9 @@ balance_cleanup:
 
   return rc;
 }
+#if defined(_MSC_VER) && _MSC_VER >= 1700 && defined(_M_ARM)
+#pragma optimize("", on)
+#endif
 
 
 /*