reallocarray: a bit more tuning

* lib/reallocarray.c: Include intprops.h.
(reallocarray): Use INT_MULTIPLY_WRAPV instead of
xalloc_oversized, as it now suffices and is likely a bit more
efficient (five fewer machine insns on Ubuntu 20.10 x86-64).
* modules/reallocarray (Depends-on): Depend on intprops, not
xalloc-oversized.  Use conditional dependencies to avoid building
realloc-gnu when not needed.

1 files changed, 4 insertions, 3 deletions

diff --git a/lib/reallocarray.c b/lib/reallocarray.c
index 03197c601b..d5cfa05d57 100644
--- a/lib/reallocarray.c
+++ b/lib/reallocarray.c
@@ -22,17 +22,18 @@
 #include <stdlib.h>
 #include <errno.h>
 
-#include "xalloc-oversized.h"
+#include "intprops.h"
 
 void *
 reallocarray (void *ptr, size_t nmemb, size_t size)
 {
-  if (xalloc_oversized (nmemb, size))
+  size_t nbytes;
+  if (INT_MULTIPLY_WRAPV (nmemb, size, &nbytes))
     {
       errno = ENOMEM;
       return NULL;
     }
 
   /* Rely on the semantics of GNU realloc.  */
-  return realloc (ptr, nmemb * size);
+  return realloc (ptr, nbytes);
 }