Fix an incorrect optimization that was attempted as part of

check-in [18de3a8e6b431a07].

FossilOrigin-Name: f32055e8110a2eac6c9e26d1d1e620f0668bcb475d49d309dc549cea05e1e582

diff --git a/manifest b/manifest
index a18b8b9b9e23e6d9372eaa3a7fa7680461c8dcd4..560f711aaa1bc6cad44359aded801c6ab0c50f2c 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Omit\sunnecessary\sbranches\sfrom\sthe\senhanced\sfloating-point\sconversion\nlogic.
-D 2023-02-23T22:08:22.561
+C Fix\san\sincorrect\soptimization\sthat\swas\sattempted\sas\spart\sof\ncheck-in\s[18de3a8e6b431a07].
+D 2023-02-24T01:08:35.334
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -617,7 +617,7 @@ F src/pcache1.c dee95e3cd2b61e6512dc814c5ab76d5eb36f0bfc9441dbb4260fccc0d12bbddc
 F src/pragma.c 82d5090a35eac75876d3b41f48d06b2370553c9576bf2942233c462e03eb94c9
 F src/pragma.h e690a356c18e98414d2e870ea791c1be1545a714ba623719deb63f7f226d8bb7
 F src/prepare.c ce87a08cfddd45a147150db34190b1986f2d4a0e0828858cb6bd908c78fb02e3
-F src/printf.c 74e763868698df16ae24e96558c2a6ab9232ceaa373d326087bf519d2b75708d
+F src/printf.c 5957a30d107a3916a411cb979b9ee80447dc3717aecc4648a4d8cce0f929e508
 F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
 F src/resolve.c d62c5665279cc7485f9d45b5e20911cc7b19c203f268321a90d05d74f4725750
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
@@ -1381,7 +1381,7 @@ F test/pragma4.test ca5e4dfc46adfe490f75d73734f70349d95a199e6510973899e502eef2c8
 F test/pragma5.test 7b33fc43e2e41abf17f35fb73f71b49671a380ea92a6c94b6ce530a25f8d9102
 F test/pragmafault.test 275edaf3161771d37de60e5c2b412627ac94cef11739236bec12ed1258b240f8
 F test/prefixes.test b524a1c44bffec225b9aec98bd728480352aa8532ac4c15771fb85e8beef65d9
-F test/printf.test 22449e13983e9d94fe9a671db68a086c4c55dea51daad825ef7ebb3d192ee997
+F test/printf.test 931381fede4f901d5f76275959339502f7d3312492c8df129972487951ff9fd1
 F test/printf2.test 3f55c1871a5a65507416076f6eb97e738d5210aeda7595a74ee895f2224cce60
 F test/progress.test ebab27f670bd0d4eb9d20d49cef96e68141d92fb
 F test/ptrchng.test ef1aa72d6cf35a2bbd0869a649b744e9d84977fc
@@ -2046,8 +2046,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 18de3a8e6b431a075143631eafdcf0e1b1a21868b417394c365d46d2feca10b5
-R b615a8a32d1ccae3d6ecef9da1392398
+P 32b0ba0d27481d85a4b0037ec36befcbffecdec75891eba58569acb160045553
+R d1a241fa3d7686eec8ef50c8409ad626
 U drh
-Z 97c2ef6d7f0bcb8f23c758a013f9c50f
+Z 23dd6be15d54b437c81982a9d1edbb20
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 346f81dbc0cf3cdd6e8f5b92d966e37f0f6adf74..7e680c44f23ef9c48f48b91d302e3618defd6120 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-32b0ba0d27481d85a4b0037ec36befcbffecdec75891eba58569acb160045553
\ No newline at end of file
+f32055e8110a2eac6c9e26d1d1e620f0668bcb475d49d309dc549cea05e1e582
\ No newline at end of file

diff --git a/src/printf.c b/src/printf.c
index 49a27893123232857d3c67265d24a5c904ae8858..45a31ec8dc9f54f868afc1dc4e185c912914c637 100644 (file)
--- a/src/printf.c
+++ b/src/printf.c
@@ -574,20 +574,16 @@ void sqlite3_str_vappendf(
           msd = 0;
           longvalue = 0;  /* To prevent a compiler warning */
           idx = precision & 0xfff;
-          if( idx>20 ){
-            rounder = 0.0;
-          }else{
-            rounder = arRound[idx%10];
-            while( idx>=10 ){ rounder *= 1.0e-10; idx -= 10; }
-            if( xtype==etFLOAT ){
-              double rx = (double)realvalue;
-              sqlite3_uint64 u;
-              int ex;
-              memcpy(&u, &rx, sizeof(u));
-              ex = -1023 + (int)((u>>52)&0x7ff);
-              if( precision+(ex/3) < 15 ) rounder += realvalue*3e-16;
-              realvalue += rounder;
-            }
+          rounder = arRound[idx%10];
+          while( idx>=10 ){ rounder *= 1.0e-10; idx -= 10; }
+          if( xtype==etFLOAT ){
+            double rx = (double)realvalue;
+            sqlite3_uint64 u;
+            int ex;
+            memcpy(&u, &rx, sizeof(u));
+            ex = -1023 + (int)((u>>52)&0x7ff);
+            if( precision+(ex/3) < 15 ) rounder += realvalue*3e-16;
+            realvalue += rounder;
           }
           if( sqlite3IsNaN((double)realvalue) ){
             bufpt = "NaN";

diff --git a/test/printf.test b/test/printf.test
index 24b78529f60d3aeea13635571cde07f6858d0c3e..e4beb12dd00e2040f5218652c66b78839028eb29 100644 (file)
--- a/test/printf.test
+++ b/test/printf.test
@@ -3820,5 +3820,8 @@ do_execsql_test printf-17.9 {
 do_execsql_test printf-17.10 {
   SELECT format('%.5g', 199990000.0);
 } 1.9999e+08
+do_execsql_test printf-17.11 {
+  SELECT format('%.30f',1.0000000000000000076e-50);
+} 0.000000000000000000000000000000
 
 finish_test