This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Re: Patch: malloc function attribute
- To: law at cygnus dot com
- Subject: Re: Patch: malloc function attribute
- From: "Kaveh R. Ghazi" <ghazi at caip dot rutgers dot edu>
- Date: Tue, 30 Nov 1999 19:26:50 -0500 (EST)
- Cc: egcs-patches at egcs dot cygnus dot com
> From: Jeffrey A Law <law@cygnus.com>
>
> In message <199911302206.RAA04413@caip.rutgers.edu>you write:
> > So my intention now is to avoid marking xrealloc and to take out the
> > mark on realloc. I will check in this change tonight, thanks everyone
> > for all of your input.
>
> Thanks. Consider it pre-approved by the masses :-)
> jeff
Done. Here's what got checked in. :-)
--Kaveh
Index: ChangeLog
===================================================================
RCS file: /cvs/gcc/egcs/gcc/ChangeLog,v
retrieving revision 1.5105
diff -u -p -r1.5105 ChangeLog
--- ChangeLog 1999/11/30 23:26:37 1.5105
+++ ChangeLog 1999/11/30 23:45:04
@@ -1,5 +1,10 @@
1999-11-30 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
+ * calls.c (special_function_p): Remove `realloc' and add `strdup'
+ to the list of functions which have attribute malloc by default.
+
+1999-11-30 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
+
* c-lex.c (yylex): With -Wtraditional, when the ANSI type of an
integer constant does not match the traditional type, limit the
warnings to cases where the base of the type is ten.
Index: calls.c
===================================================================
RCS file: /cvs/gcc/egcs/gcc/calls.c,v
retrieving revision 1.70
diff -u -p -r1.70 calls.c
--- calls.c 1999/11/28 20:45:34 1.70
+++ calls.c 1999/11/30 23:45:07
@@ -607,10 +607,12 @@ special_function_p (name, fndecl, return
&& ! strcmp (tname, "longjmp"))
*is_longjmp = 1;
/* Do not add any more malloc-like functions to this list,
- instead mark as malloc functions using the malloc attribute. */
+ instead mark them as malloc functions using the malloc attribute.
+ Note, realloc is not suitable for attribute malloc since
+ it may return the same address across multiple calls. */
else if (! strcmp (tname, "malloc")
|| ! strcmp (tname, "calloc")
- || ! strcmp (tname, "realloc")
+ || ! strcmp (tname, "strdup")
/* Note use of NAME rather than TNAME here. These functions
are only reserved when preceded with __. */
|| ! strcmp (name, "__vn") /* mangled __builtin_vec_new */
Index: ChangeLog
===================================================================
RCS file: /cvs/gcc/egcs/include/ChangeLog,v
retrieving revision 1.28
diff -u -p -r1.28 ChangeLog
--- ChangeLog 1999/11/29 02:08:36 1.28
+++ ChangeLog 1999/11/30 23:55:08
@@ -1,3 +1,12 @@
+1999-11-30 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
+
+ * ansidecl.h (ATTRIBUTE_MALLOC): New macro.
+
+ * libiberty.h (buildargv, dupargv, concat, choose_temp_base,
+ make_temp_file, xmalloc, xcalloc, xstrdup, xmemdup): Add
+ ATTRIBUTE_MALLOC.
+ (xatexit): Remove __GNUC__ check, add ATTRIBUTE_NORETURN.
+
1999-11-28 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
* libiberty.h: Include stdarg.h when ANSI_PROTOTYPES is defined.
Index: ansidecl.h
===================================================================
RCS file: /cvs/gcc/egcs/include/ansidecl.h,v
retrieving revision 1.5
diff -u -p -r1.5 ansidecl.h
--- ansidecl.h 1999/11/10 17:57:20 1.5
+++ ansidecl.h 1999/11/30 23:55:08
@@ -187,6 +187,15 @@ So instead we use the macro below and te
# define __attribute__(x)
#endif
+/* Attribute __malloc__ on functions was valid as of gcc 2.96. */
+#ifndef ATTRIBUTE_MALLOC
+# if (GCC_VERSION >= 2096)
+# define ATTRIBUTE_MALLOC __attribute__ ((__malloc__))
+# else
+# define ATTRIBUTE_MALLOC
+# endif /* GNUC >= 2.96 */
+#endif /* ATTRIBUTE_MALLOC */
+
/* Attributes on labels were valid as of gcc 2.93. */
#ifndef ATTRIBUTE_UNUSED_LABEL
# if (GCC_VERSION >= 2093)
Index: libiberty.h
===================================================================
RCS file: /cvs/gcc/egcs/include/libiberty.h,v
retrieving revision 1.10
diff -u -p -r1.10 libiberty.h
--- libiberty.h 1999/11/29 02:08:36 1.10
+++ libiberty.h 1999/11/30 23:55:08
@@ -19,7 +19,7 @@ extern "C" {
/* Build an argument vector from a string. Allocates memory using
malloc. Use freeargv to free the vector. */
-extern char **buildargv PARAMS ((char *));
+extern char **buildargv PARAMS ((char *)) ATTRIBUTE_MALLOC;
/* Free a vector returned by buildargv. */
@@ -28,7 +28,7 @@ extern void freeargv PARAMS ((char **));
/* Duplicate an argument vector. Allocates memory using malloc. Use
freeargv to free the vector. */
-extern char **dupargv PARAMS ((char **));
+extern char **dupargv PARAMS ((char **)) ATTRIBUTE_MALLOC;
/* Return the last component of a path name. Note that we can't use a
@@ -45,7 +45,7 @@ extern char *basename ();
/* Concatenate an arbitrary number of strings, up to (char *) NULL.
Allocates memory using xmalloc. */
-extern char *concat PARAMS ((const char *, ...));
+extern char *concat PARAMS ((const char *, ...)) ATTRIBUTE_MALLOC;
/* Check whether two file descriptors refer to the same file. */
@@ -62,11 +62,11 @@ extern long get_run_time PARAMS ((void))
/* Choose a temporary directory to use for scratch files. */
-extern char *choose_temp_base PARAMS ((void));
+extern char *choose_temp_base PARAMS ((void)) ATTRIBUTE_MALLOC;
/* Return a temporary file name or NULL if unable to create one. */
-extern char *make_temp_file PARAMS ((const char *));
+extern char *make_temp_file PARAMS ((const char *)) ATTRIBUTE_MALLOC;
/* Allocate memory filled with spaces. Allocates using malloc. */
@@ -117,11 +117,7 @@ extern int xatexit PARAMS ((void (*fn) (
/* Exit, calling all the functions registered with xatexit. */
-#ifndef __GNUC__
-extern void xexit PARAMS ((int status));
-#else
-void xexit PARAMS ((int status)) __attribute__ ((noreturn));
-#endif
+extern void xexit PARAMS ((int status)) ATTRIBUTE_NORETURN;
/* Set the program name used by xmalloc. */
@@ -137,24 +133,26 @@ extern void xmalloc_set_program_name PAR
/* Get a definition for va_list. */
#include <stdarg.h>
#endif
-extern PTR xmalloc PARAMS ((size_t));
+extern PTR xmalloc PARAMS ((size_t)) ATTRIBUTE_MALLOC;
-/* Reallocate memory without fail. This works like xmalloc. */
+/* Reallocate memory without fail. This works like xmalloc. Note,
+ realloc type functions are not suitable for attribute malloc since
+ they may return the same address across multiple calls. */
extern PTR xrealloc PARAMS ((PTR, size_t));
/* Allocate memory without fail and set it to zero. This works like
xmalloc. */
-extern PTR xcalloc PARAMS ((size_t, size_t));
+extern PTR xcalloc PARAMS ((size_t, size_t)) ATTRIBUTE_MALLOC;
/* Copy a string into a memory buffer without fail. */
-extern char *xstrdup PARAMS ((const char *));
+extern char *xstrdup PARAMS ((const char *)) ATTRIBUTE_MALLOC;
/* Copy an existing memory buffer to a new memory buffer without fail. */
-extern PTR xmemdup PARAMS ((const PTR, size_t, size_t));
+extern PTR xmemdup PARAMS ((const PTR, size_t, size_t)) ATTRIBUTE_MALLOC;
/* hex character manipulation routines */