From: drh Date: Mon, 23 Nov 2020 21:05:29 +0000 (+0000) Subject: Syntactic changes to work around a bug in gcov 9.3.0. No changes to the X-Git-Tag: version-3.34.0~20 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=de9873bb0a4050b029cdcb72415ef60d92780a3f;p=thirdparty%2Fsqlite.git Syntactic changes to work around a bug in gcov 9.3.0. No changes to the generated code for release builds. FossilOrigin-Name: 4f1573b146193e5d552981a9d1d11e50da4da4a843f790e4af1cf0cc19a0b020 --- diff --git a/manifest b/manifest index f505c98e0e..e087919164 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C In\sos_unix.c,\sput\sALWAYS()\son\sunreachable\sbranches\sassociated\swith\spathname\nnormalization. -D 2020-11-23T17:36:06.943 +C Syntactic\schanges\sto\swork\saround\sa\sbug\sin\sgcov\s9.3.0.\s\sNo\schanges\sto\sthe\ngenerated\scode\sfor\srelease\sbuilds. +D 2020-11-23T21:05:29.175 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -615,7 +615,7 @@ F src/vdbe.c d24a43b6b1ed2dba893636a14f5e56001444ab3fd5465e3bca8ab01799840acd F src/vdbe.h 83603854bfa5851af601fc0947671eb260f4363e62e960e8a994fb9bbcd2aaa1 F src/vdbeInt.h 3ca5e9fd6e095a8b6cf6bc3587a46fc93499503b2fe48951e1034ba9e2ce2f6e F src/vdbeapi.c c5e7cb2ab89a24d7f723e87b508f21bfb1359a04db5277d8a99fd1e015c12eb9 -F src/vdbeaux.c c4c0389aed3ac31f835904c3d1f730d6818742633f9474140d8ce174c10f2267 +F src/vdbeaux.c c76b7e96e189f5056d1de914d33d07bd03d3b88741f75375c8e18c9b11ffd379 F src/vdbeblob.c 253ed82894924c362a7fa3079551d3554cd1cdace39aa833da77d3bc67e7c1b1 F src/vdbemem.c 947f2a65910edb4014dc981d33e414a68c51f169f9df8c4c493a0ba840b6eb1f F src/vdbesort.c f5b5e473a7cee44e47a94817b042fd7172cf3aa2c0a7928a8339d612bcfdec5a @@ -1886,7 +1886,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 2c437f7a2c87129d00c71fa569315b68e0ba9514041d93503350c9ae9f080f17 -R 3991e5c25074cbb0d90849adccd287d5 +P b45a08e3c7edfa76b699d3e29f28daa5bd08039668ec57121e4e85edf36150f1 +R aa9c8539b4884f3a1b8400570d0da31a U drh -Z 6d9d66ca2a393378f613e4c4179785fa +Z 342b4d94dd69f30e34f2169882746b1d diff --git a/manifest.uuid b/manifest.uuid index 2b58cfdb6a..6fb5a38001 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -b45a08e3c7edfa76b699d3e29f28daa5bd08039668ec57121e4e85edf36150f1 \ No newline at end of file +4f1573b146193e5d552981a9d1d11e50da4da4a843f790e4af1cf0cc19a0b020 \ No newline at end of file diff --git a/src/vdbeaux.c b/src/vdbeaux.c index 0c223b0fc1..dfd259d718 100644 --- a/src/vdbeaux.c +++ b/src/vdbeaux.c @@ -4295,9 +4295,12 @@ SQLITE_NOINLINE int sqlite3BlobCompare(const Mem *pB1, const Mem *pB2){ static int sqlite3IntFloatCompare(i64 i, double r){ if( sizeof(LONGDOUBLE_TYPE)>8 ){ LONGDOUBLE_TYPE x = (LONGDOUBLE_TYPE)i; + testcase( xr ); + testcase( x==r ); if( xr ) return +1; - return 0; + if( x>r ) return +1; /*NO_TEST*/ /* work around bugs in gcov */ + return 0; /*NO_TEST*/ /* work around bugs in gcov */ }else{ i64 y; double s;