Reduce startup costs for Value_Range.

[thirdparty/gcc.git] / libiberty / objalloc.c

diff --git a/libiberty/objalloc.c b/libiberty/objalloc.c
index 57754a8610524a59bdb56d35805cb1e4be222ce9..b651aab60d60c9446f546aab51bcb298c87ee883 100644 (file)
--- a/libiberty/objalloc.c
+++ b/libiberty/objalloc.c
@@ -1,5 +1,5 @@
 /* objalloc.c -- routines to allocate memory for objects
-   Copyright 1997 Free Software Foundation, Inc.
+   Copyright (C) 1997-2024 Free Software Foundation, Inc.
    Written by Ian Lance Taylor, Cygnus Solutions.
 
 This program is free software; you can redistribute it and/or modify it
@@ -14,10 +14,12 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
-Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+Foundation, 51 Franklin Street - Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
+#include "config.h"
 #include "ansidecl.h"
+
 #include "objalloc.h"
 
 /* Get a definition for NULL.  */
@@ -28,14 +30,17 @@ Boston, MA 02111-1307, USA.  */
 #include <unixlib.h>
 #else
 
-#ifdef ANSI_PROTOTYPES
 /* Get a definition for size_t.  */
 #include <stddef.h>
-#endif
 
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#else
 /* For systems with larger pointers than ints, this must be declared.  */
-extern PTR malloc PARAMS ((size_t));
-extern void free PARAMS ((PTR));
+extern void *malloc (size_t);
+extern void free (void *);
+#endif
+
 #endif
 
 /* These routines allocate space for an object.  Freeing allocated
@@ -78,7 +83,7 @@ struct objalloc_chunk
 /* Create an objalloc structure.  */
 
 struct objalloc *
-objalloc_create ()
+objalloc_create (void)
 {
   struct objalloc *ret;
   struct objalloc_chunk *chunk;
@@ -87,7 +92,7 @@ objalloc_create ()
   if (ret == NULL)
     return NULL;
 
-  ret->chunks = (PTR) malloc (CHUNK_SIZE);
+  ret->chunks = (void *) malloc (CHUNK_SIZE);
   if (ret->chunks == NULL)
     {
       free (ret);
@@ -106,11 +111,11 @@ objalloc_create ()
 
 /* Allocate space from an objalloc structure.  */
 
-PTR
-_objalloc_alloc (o, len)
-     struct objalloc *o;
-     unsigned long len;
+void *
+_objalloc_alloc (struct objalloc *o, unsigned long original_len)
 {
+  unsigned long len = original_len;
+
   /* We avoid confusion from zero sized objects by always allocating
      at least 1 byte.  */
   if (len == 0)
@@ -118,11 +123,16 @@ _objalloc_alloc (o, len)
 
   len = (len + OBJALLOC_ALIGN - 1) &~ (OBJALLOC_ALIGN - 1);
 
+  /* Check for overflow in the alignment operation above and the
+     malloc argument below. */
+  if (len + CHUNK_HEADER_SIZE < original_len)
+    return NULL;
+
   if (len <= o->current_space)
     {
       o->current_ptr += len;
       o->current_space -= len;
-      return (PTR) (o->current_ptr - len);
+      return (void *) (o->current_ptr - len);
     }
 
   if (len >= BIG_REQUEST)
@@ -138,9 +148,9 @@ _objalloc_alloc (o, len)
       chunk->next = (struct objalloc_chunk *) o->chunks;
       chunk->current_ptr = o->current_ptr;
 
-      o->chunks = (PTR) chunk;
+      o->chunks = (void *) chunk;
 
-      return (PTR) (ret + CHUNK_HEADER_SIZE);
+      return (void *) (ret + CHUNK_HEADER_SIZE);
     }
   else
     {
@@ -155,7 +165,7 @@ _objalloc_alloc (o, len)
       o->current_ptr = (char *) chunk + CHUNK_HEADER_SIZE;
       o->current_space = CHUNK_SIZE - CHUNK_HEADER_SIZE;
 
-      o->chunks = (PTR) chunk;
+      o->chunks = (void *) chunk;
 
       return objalloc_alloc (o, len);
     }
@@ -164,8 +174,7 @@ _objalloc_alloc (o, len)
 /* Free an entire objalloc structure.  */
 
 void
-objalloc_free (o)
-     struct objalloc *o;
+objalloc_free (struct objalloc *o)
 {
   struct objalloc_chunk *l;
 
@@ -186,9 +195,7 @@ objalloc_free (o)
    recently allocated blocks.  */
 
 void
-objalloc_free_block (o, block)
-     struct objalloc *o;
-     PTR block;
+objalloc_free_block (struct objalloc *o, void *block)
 {
   struct objalloc_chunk *p, *small;
   char *b = (char *) block;
@@ -250,7 +257,7 @@ objalloc_free_block (o, block)
 
       if (first == NULL)
        first = p;
-      o->chunks = (PTR) first;
+      o->chunks = (void *) first;
 
       /* Now start allocating from this small block again.  */
       o->current_ptr = b;
@@ -280,7 +287,7 @@ objalloc_free_block (o, block)
          q = next;
        }
 
-      o->chunks = (PTR) p;
+      o->chunks = (void *) p;
 
       while (p->current_ptr != NULL)
        p = p->next;