From 38fad0f3e447ae470661564f8b1349bed7ba19ab Mon Sep 17 00:00:00 2001
From: Rusty Russell <rusty@rustcorp.com.au>
Date: Tue, 15 Jun 2021 06:37:36 +0930
Subject: [PATCH] ccan: update to get RETURNS_NONNULL macro.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
---
 ccan/README                            |  2 +-
 ccan/ccan/compiler/compiler.h          | 13 +++++++++++++
 ccan/tools/configurator/configurator.c |  3 +++
 tools/mockup.sh                        |  2 +-
 4 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/ccan/README b/ccan/README
index 3316cef10..289e9cf25 100644
--- a/ccan/README
+++ b/ccan/README
@@ -1,3 +1,3 @@
 CCAN imported from http://ccodearchive.net.
 
-CCAN version: init-2504-g48b4ffc3
+CCAN version: init-2506-gec95c3c5
diff --git a/ccan/ccan/compiler/compiler.h b/ccan/ccan/compiler/compiler.h
index 1bbb3b8b6..562b29ec7 100644
--- a/ccan/ccan/compiler/compiler.h
+++ b/ccan/ccan/compiler/compiler.h
@@ -271,6 +271,19 @@
 #define NON_NULL_ARGS(...)
 #endif
 
+#if HAVE_ATTRIBUTE_RETURNS_NONNULL
+/**
+ * RETURNS_NONNULL - specify that this function cannot return NULL.
+ *
+ * Mainly an optimization opportunity, but can also suppress warnings.
+ *
+ * Example:
+ * RETURNS_NONNULL char *my_copy(char *buf);
+ */
+#define RETURNS_NONNULL __attribute__((__returns_nonnull__))
+#else
+#define RETURNS_NONNULL
+#endif
 
 #if HAVE_ATTRIBUTE_SENTINEL
 /**
diff --git a/ccan/tools/configurator/configurator.c b/ccan/tools/configurator/configurator.c
index 33651ef4d..9487e694c 100644
--- a/ccan/tools/configurator/configurator.c
+++ b/ccan/tools/configurator/configurator.c
@@ -142,6 +142,9 @@ static const struct test base_tests[] = {
 	{ "HAVE_ATTRIBUTE_NONNULL", "__attribute__((nonnull)) support",
 	  "DEFINES_FUNC", NULL, NULL,
 	  "static char *__attribute__((nonnull)) func(char *p) { return p; }" },
+	{ "HAVE_ATTRIBUTE_RETURNS_NONNULL", "__attribute__((returns_nonnull)) support",
+	  "DEFINES_FUNC", NULL, NULL,
+	  "static const char *__attribute__((returns_nonnull)) func(void) { return \"hi\"; }" },
 	{ "HAVE_ATTRIBUTE_SENTINEL", "__attribute__((sentinel)) support",
 	  "DEFINES_FUNC", NULL, NULL,
 	  "static int __attribute__((sentinel)) func(int i, ...) { return i; }" },
diff --git a/tools/mockup.sh b/tools/mockup.sh
index 9686b14cf..f1e8ac047 100755
--- a/tools/mockup.sh
+++ b/tools/mockup.sh
@@ -61,5 +61,5 @@ for SYMBOL; do
 
     echo "/* Generated stub for $SYMBOL */"
 
-    tail -n "+${LINE}" < "$FILE" | head -n "$NUM" | sed 's/^extern *//' | sed 's/PRINTF_FMT([^)]*)//' | sed 's/NON_NULL_ARGS([^)]*)//' | sed 's/NO_NULL_ARGS//g' | sed 's/NORETURN//g' | sed 's/LAST_ARG_NULL//g' | sed 's/WARN_UNUSED_RESULT//g' | sed 's/,/ UNNEEDED,/g' | sed 's/\([a-z0-9A-Z*_]* [a-z0-9A-Z*_]*\));/\1 UNNEEDED);/' | sed "s/;\$/$STUB/" | sed 's/[[:space:]]*$//'
+    tail -n "+${LINE}" < "$FILE" | head -n "$NUM" | sed 's/^extern *//' | sed 's/PRINTF_FMT([^)]*)//' | sed 's/NON_NULL_ARGS([^)]*)//' | sed 's/NO_NULL_ARGS//g' | sed 's/NORETURN//g' | sed 's/RETURNS_NONNULL//g' | sed 's/LAST_ARG_NULL//g' | sed 's/WARN_UNUSED_RESULT//g' | sed 's/,/ UNNEEDED,/g' | sed 's/\([a-z0-9A-Z*_]* [a-z0-9A-Z*_]*\));/\1 UNNEEDED);/' | sed "s/;\$/$STUB/" | sed 's/[[:space:]]*$//'
 done