From: mistachkin <mistachkin@noemail.net>
Date: Tue, 2 Oct 2012 22:54:27 +0000 (+0000)
Subject: Work around an optimization issue with the MSVC compiler for ARM.
X-Git-Tag: version-3.7.15~95
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=e7c54168faa48c0e589b5fbbe9fd96409801b177;p=thirdparty%2Fsqlite.git

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

FossilOrigin-Name: 7d301fdfeec540e4a58f43bff04d219e9f769dc4
---

diff --git a/manifest b/manifest
index 58498bcbfe..178efcf35c 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C More\slenient\shandling\sof\sORDER\sBY\soptimization\sin\sjoins\swith\smixed\sASC/DESC.\nThis\sis\sa\sbetter\sand\sless\srestrictive\sfix\sfor\sthe\sproblem\saddressed\sby\nthe\sprevious\scheck-in.
-D 2012-10-02T15:19:19.625
+C Work\saround\san\soptimization\sissue\swith\sthe\sMSVC\scompiler\sfor\sARM.
+D 2012-10-02T22:54:27.390
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5f4f26109f9d80829122e0e09f9cda008fa065fb
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -121,7 +121,7 @@ F src/auth.c 523da7fb4979469955d822ff9298352d6b31de34
 F src/backup.c afc067b9a9050ff48b9d46285c53d096c556a73d
 F src/bitvec.c 26675fe8e431dc555e6f2d0e11e651d172234aa1
 F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7
-F src/btree.c 95ee3c1e788ac1f68d3ffc37b599c811a34c080b
+F src/btree.c 14de53ebb334633ee632ab3c5b9262cfe7cbe455
 F src/btree.h 078f76b28c338ab6eb6dd7324d63ee54463aeb6c
 F src/btreeInt.h 4e5c2bd0f9b36b2a815a6d84f771a61a65830621
 F src/build.c c4555e16f8ccdadb2616014c617ed8166c5a93f7
@@ -1018,7 +1018,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/win/sqlite.vsix 67d8a99aceb56384a81b3f30d6c71743146d2cc9
-P b0e7b4df6c2a8c479f8d210bde50c737eaa248f0
-R a1842b2ba16ad28b21201e48479c524d
-U drh
-Z 4c91eefd164f9f4e974324de15060f38
+P abcf6a5d054559ee5a093ba39180c47b4958d9cd
+R e2af9a84c8984f66075b1b5542126d99
+U mistachkin
+Z 2e5e5eca8b24072e2977c29980c9c33a
diff --git a/manifest.uuid b/manifest.uuid
index 22cffbf9b5..6ff004a2db 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-abcf6a5d054559ee5a093ba39180c47b4958d9cd
\ No newline at end of file
+7d301fdfeec540e4a58f43bff04d219e9f769dc4
\ No newline at end of file
diff --git a/src/btree.c b/src/btree.c
index 296469378a..4ee0c860a7 100644
--- a/src/btree.c
+++ b/src/btree.c
@@ -5940,6 +5940,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 */
@@ -6570,6 +6573,9 @@ balance_cleanup:
 
   return rc;
 }
+#if defined(_MSC_VER) && _MSC_VER >= 1700 && defined(_M_ARM)
+#pragma optimize("", on)
+#endif
 
 
 /*