Resize the coefficient to MPD_MINALLOC also if the requested size is below

Stefan Krah · Stefan Krah · commit f69aef747a9a · 2012-04-09T20:47:57.000+02:00
MPD_MINALLOC. Previously the resize was skipped as a micro optimization.
diff --git a/Modules/_decimal/libmpdec/mpdecimal.c b/Modules/_decimal/libmpdec/mpdecimal.c
@@ -480,17 +480,20 @@ mpd_qresize(mpd_t *result, mpd_ssize_t nwords, uint32_t *status)
 {
     assert(!mpd_isconst_data(result)); /* illegal operation for a const */
     assert(!mpd_isshared_data(result)); /* illegal operation for a shared */
+    assert(MPD_MINALLOC <= result->alloc);
 
+    nwords = (nwords <= MPD_MINALLOC) ? MPD_MINALLOC : nwords;
+    if (nwords == result->alloc) {
+        return 1;
+    }
     if (mpd_isstatic_data(result)) {
         if (nwords > result->alloc) {
             return mpd_switch_to_dyn(result, nwords, status);
         }
-    }
-    else if (nwords != result->alloc && nwords >= MPD_MINALLOC) {
-        return mpd_realloc_dyn(result, nwords, status);
+        return 1;
     }
 
-    return 1;
+    return mpd_realloc_dyn(result, nwords, status);
 }
 
 /* Same as mpd_qresize, but the complete coefficient (including the old
@@ -500,20 +503,21 @@ mpd_qresize_zero(mpd_t *result, mpd_ssize_t nwords, uint32_t *status)
 {
     assert(!mpd_isconst_data(result)); /* illegal operation for a const */
     assert(!mpd_isshared_data(result)); /* illegal operation for a shared */
+    assert(MPD_MINALLOC <= result->alloc);
 
-    if (mpd_isstatic_data(result)) {
-        if (nwords > result->alloc) {
-            return mpd_switch_to_dyn_zero(result, nwords, status);
+    nwords = (nwords <= MPD_MINALLOC) ? MPD_MINALLOC : nwords;
+    if (nwords != result->alloc) {
+        if (mpd_isstatic_data(result)) {
+            if (nwords > result->alloc) {
+                return mpd_switch_to_dyn_zero(result, nwords, status);
+            }
         }
-    }
-    else if (nwords != result->alloc && nwords >= MPD_MINALLOC) {
-        if (!mpd_realloc_dyn(result, nwords, status)) {
+        else if (!mpd_realloc_dyn(result, nwords, status)) {
             return 0;
         }
     }
 
     mpd_uint_zero(result->data, nwords);
-
     return 1;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -480,17 +480,20 @@ mpd_qresize(mpd_t result, mpd_ssize_t nwords, uint32_t status)`
`480`	`480`	`{`
`481`	`481`	`assert(!mpd_isconst_data(result)); /* illegal operation for a const */`
`482`	`482`	`assert(!mpd_isshared_data(result)); /* illegal operation for a shared */`
	`483`	`+ assert(MPD_MINALLOC <= result->alloc);`
`483`	`484`
	`485`	`+ nwords = (nwords <= MPD_MINALLOC) ? MPD_MINALLOC : nwords;`
	`486`	`+ if (nwords == result->alloc) {`
	`487`	`+ return 1;`
	`488`	`+ }`
`484`	`489`	`if (mpd_isstatic_data(result)) {`
`485`	`490`	`if (nwords > result->alloc) {`
`486`	`491`	`return mpd_switch_to_dyn(result, nwords, status);`
`487`	`492`	`}`
`488`		`- }`
`489`		`- else if (nwords != result->alloc && nwords >= MPD_MINALLOC) {`
`490`		`- return mpd_realloc_dyn(result, nwords, status);`
	`493`	`+ return 1;`
`491`	`494`	`}`
`492`	`495`
`493`		`- return 1;`
	`496`	`+ return mpd_realloc_dyn(result, nwords, status);`
`494`	`497`	`}`
`495`	`498`
`496`	`499`	`/* Same as mpd_qresize, but the complete coefficient (including the old`
`@@ -500,20 +503,21 @@ mpd_qresize_zero(mpd_t result, mpd_ssize_t nwords, uint32_t status)`
`500`	`503`	`{`
`501`	`504`	`assert(!mpd_isconst_data(result)); /* illegal operation for a const */`
`502`	`505`	`assert(!mpd_isshared_data(result)); /* illegal operation for a shared */`
	`506`	`+ assert(MPD_MINALLOC <= result->alloc);`
`503`	`507`
`504`		`- if (mpd_isstatic_data(result)) {`
`505`		`- if (nwords > result->alloc) {`
`506`		`- return mpd_switch_to_dyn_zero(result, nwords, status);`
	`508`	`+ nwords = (nwords <= MPD_MINALLOC) ? MPD_MINALLOC : nwords;`
	`509`	`+ if (nwords != result->alloc) {`
	`510`	`+ if (mpd_isstatic_data(result)) {`
	`511`	`+ if (nwords > result->alloc) {`
	`512`	`+ return mpd_switch_to_dyn_zero(result, nwords, status);`
	`513`	`+ }`
`507`	`514`	`}`
`508`		`- }`
`509`		`- else if (nwords != result->alloc && nwords >= MPD_MINALLOC) {`
`510`		`- if (!mpd_realloc_dyn(result, nwords, status)) {`
	`515`	`+ else if (!mpd_realloc_dyn(result, nwords, status)) {`
`511`	`516`	`return 0;`
`512`	`517`	`}`
`513`	`518`	`}`
`514`	`519`
`515`	`520`	`mpd_uint_zero(result->data, nwords);`
`516`		`-`
`517`	`521`	`return 1;`
`518`	`522`	`}`
`519`	`523`