From 62c986afde031d141961d2619a860def836c8e9b Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Mon, 4 Aug 2014 17:46:33 +0200 Subject: [PATCH] * runtime/memory.c (xmallocarray): Avoid division for the common case. From-SVN: r213593 --- libgfortran/ChangeLog | 4 ++++ libgfortran/runtime/memory.c | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index 80f87523a695..77afd166d075 100644 --- a/libgfortran/ChangeLog +++ b/libgfortran/ChangeLog @@ -1,3 +1,7 @@ +2014-08-04 Jakub Jelinek + + * runtime/memory.c (xmallocarray): Avoid division for the common case. + 2014-07-20 Jerry DeLisle PR libgfortran/61632 diff --git a/libgfortran/runtime/memory.c b/libgfortran/runtime/memory.c index 501d870b83ca..16f06065e2b5 100644 --- a/libgfortran/runtime/memory.c +++ b/libgfortran/runtime/memory.c @@ -56,7 +56,9 @@ xmallocarray (size_t nmemb, size_t size) if (!nmemb || !size) size = nmemb = 1; - else if (nmemb > SIZE_MAX / size) +#define HALF_SIZE_T (((size_t) 1) << (__CHAR_BIT__ * sizeof (size_t) / 2)) + else if (__builtin_expect ((nmemb | size) >= HALF_SIZE_T, 0) + && nmemb > SIZE_MAX / size) { errno = ENOMEM; os_error ("Integer overflow in xmallocarray"); -- 2.47.3