Add function attributes to memcpy, malloc, and friends.

Author: sunfishcode

basics/include/__functions_malloc.h

@@ -0,0 +1,22 @@
+#ifndef __wasm___functions_malloc_h
+#define __wasm___functions_malloc_h
+
+#define __need_size_t
+#define __need_wchar_t
+#define __need_NULL
+#include <stddef.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void *malloc(size_t size) __attribute__((__malloc__, __warn_unused_result__));
+void free(void *ptr);
+void *calloc(size_t nmemb, size_t size) __attribute__((__malloc__, __warn_unused_result__));
+void *realloc(void *ptr, size_t size) __attribute__((__warn_unused_result__));
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

basics/include/__functions_memcpy.h

@@ -0,0 +1,20 @@
+#ifndef __wasm___functions_memcpy_h
+#define __wasm___functions_memcpy_h
+
+#define __need_size_t
+#define __need_NULL
+#include <stddef.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void *memcpy(void *__restrict__ dst, const void *__restrict__ src, size_t n) __attribute__((__nothrow__, __leaf__, __nonnull__(1, 2)));
+void *memmove(void *dst, const void *src, size_t n) __attribute__((__nothrow__, __leaf__, __nonnull__(1, 2)));
+void *memset(void *dst, int c, size_t n) __attribute__((__nothrow__, __leaf__, __nonnull__(1)));
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

basics/include/stdlib.h

@@ -1,22 +1,10 @@
-#ifndef __wasm_basics_stdlib_h
-#define __wasm_basics_stdlib_h
-
-#define __need_size_t
-#define __need_wchar_t
-#define __need_NULL
-#include <stddef.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-void *malloc(size_t size);
-void free(void *ptr);
-void *calloc(size_t nmemb, size_t size);
-void *realloc(void *ptr, size_t size);
-
-#ifdef __cplusplus
-}
-#endif
+#ifndef __wasm_stdlib_h
+#define __wasm_stdlib_h
+
+/*
+ * Include the real implementation, which is factored into a separate file so
+ * that it can be reused by other libc stdlib implementations.
+ */
+#include <__functions_malloc.h>
 
 #endif

basics/include/string.h

@@ -1,20 +1,10 @@
-#ifndef __wasm_basics_string_h
-#define __wasm_basics_string_h
-
-#define __need_size_t
-#define __need_NULL
-#include <stddef.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-void *memcpy(void *dst, const void *src, size_t n);
-void *memmove(void *dst, const void *src, size_t n);
-void *memset(void *dst, int c, size_t n);
-
-#ifdef __cplusplus
-}
-#endif
+#ifndef __wasm_string_h
+#define __wasm_string_h
+
+/*
+ * Include the real implementation, which is factored into a separate file so
+ * that it can be reused by other libc string implementations.
+ */
+#include <__functions_memcpy.h>
 
 #endif

dlmalloc/include/unistd.h

@@ -7,4 +7,4 @@
 #define _SC_PAGESIZE
 
 /* Declare sbrk. */
-void *sbrk(intptr_t increment);
+void *sbrk(intptr_t increment) __attribute__((__warn_unused_result__));

expected/wasm32-wasi/include-all.c

@@ -2,11 +2,15 @@
 #include <__errno_values.h>
 #include <__fd_set.h>
 #include <__function___isatty.h>
+#include <__functions_malloc.h>
+#include <__functions_memcpy.h>
 #include <__header_bits_signal.h>
 #include <__header_dirent.h>
 #include <__header_fcntl.h>
 #include <__header_netinet_in.h>
 #include <__header_poll.h>
+#include <__header_stdlib.h>
+#include <__header_string.h>
 #include <__header_sys_ioctl.h>
 #include <__header_sys_resource.h>
 #include <__header_sys_socket.h>

expected/wasm32-wasi/predefined-macros.txt

@@ -3639,6 +3639,8 @@
 #define __wasilibc___header_sys_stat_h 
 #define __wasilibc___header_time_h 
 #define __wasilibc___header_unistd_h 
+#define __wasilibc___headers_stdlib_h 
+#define __wasilibc___headers_string_h 
 #define __wasilibc___macro_FD_SETSIZE_h 
 #define __wasilibc___struct_dirent_h 
 #define __wasilibc___struct_in6_addr_h 
@@ -3669,6 +3671,8 @@
 #define __wasm32 1
 #define __wasm32__ 1
 #define __wasm__ 1
+#define __wasm___functions_malloc_h 
+#define __wasm___functions_memcpy_h 
 #define __wasm_basics___errno_h 
 #define __wasm_basics___macro_PAGESIZE_h 
 #define __wasm_basics___struct_stat_h 

libc-bottom-half/headers/public/__header_stdlib.h

@@ -0,0 +1,20 @@
+#ifndef __wasilibc___headers_stdlib_h
+#define __wasilibc___headers_stdlib_h
+
+#define __need_size_t
+#include <stddef.h>
+
+#include <__functions_malloc.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void abort(void) __attribute__((__noreturn__));
+void qsort(void *, size_t, size_t, int (*)(const void *, const void *));
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

libc-bottom-half/headers/public/__header_string.h

@@ -0,0 +1,23 @@
+#ifndef __wasilibc___headers_string_h
+#define __wasilibc___headers_string_h
+
+#define __need_size_t
+#define __need_NULL
+#include <stddef.h>
+
+#include <__functions_memcpy.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+size_t strlen(const char *) __attribute__((__nothrow__, __leaf__, __pure__, __nonnull__(1)));
+char *strdup(const char *) __attribute__((__nothrow__, __nonnull__(1)));
+int strcmp(const char *, const char *) __attribute__((__nothrow__, __pure__, __nonnull__(1, 2)));
+void *memchr(const void *, int, size_t) __attribute__((__nothrow__, __pure__, __nonnull__(1)));
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

libc-bottom-half/headers/public/stdlib.h

@@ -1,11 +1,10 @@
 #ifndef __wasilibc_stdlib_h
 #define __wasilibc_stdlib_h
 
-#define __need_size_t
-#include <stddef.h>
-
-void abort(void) __attribute__ ((__noreturn__));
-void qsort(void *, size_t, size_t,
-           int (*)(const void *, const void *));
+/*
+ * Include the real implementation, which is factored into a separate file so
+ * that it can be reused by other libc stdlib implementations.
+ */
+#include <__headers_stdlib.h>
 
 #endif