diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2014-08-04 17:46:33 +0200 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2014-08-04 17:46:33 +0200 |
| commit | 62c986afde031d141961d2619a860def836c8e9b (patch) | |
| tree | 5286463521855c483f9a00398080e73af7eda4fc /libgfortran | |
| parent | 3696163cb43bdd7c3a22bef46a0e3f4576d0fc44 (diff) | |
| download | gcc-62c986afde031d141961d2619a860def836c8e9b.tar.gz | |
* runtime/memory.c (xmallocarray): Avoid division for the common case.
From-SVN: r213593
Diffstat (limited to 'libgfortran')
| -rw-r--r-- | libgfortran/ChangeLog | 4 | ||||
| -rw-r--r-- | libgfortran/runtime/memory.c | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index 80f87523a69..77afd166d07 100644 --- a/libgfortran/ChangeLog +++ b/libgfortran/ChangeLog @@ -1,3 +1,7 @@ +2014-08-04 Jakub Jelinek <jakub@redhat.com> + + * runtime/memory.c (xmallocarray): Avoid division for the common case. + 2014-07-20 Jerry DeLisle <jvdelisle@gcc.gnu.org> PR libgfortran/61632 diff --git a/libgfortran/runtime/memory.c b/libgfortran/runtime/memory.c index 501d870b83c..16f06065e2b 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"); |