commit 596b091be4da929766631d852127ebe90038539a
author Owen Anderson <resistor@mac.com> Wed Jan 08 23:58:10 2025 +1300
committer Robert Norton <1412774+rmn30@users.noreply.github.com> Mon Jan 13 12:00:23 2025 +0000
tree 9ff72be44845ebe3b43e1317383e0acad9a7cddc
parent 37b94cf381bc8b5f6194b61238ed7b6af4fd5263

Use the new __cheriot_minimum_stack__ when performing stack checks.

sdk/core/allocator/alloc_config.h

diff --git a/sdk/core/allocator/alloc_config.h b/sdk/core/allocator/alloc_config.h
index 522ed8a..65af7af 100644
--- a/sdk/core/allocator/alloc_config.h
+++ b/sdk/core/allocator/alloc_config.h
@@ -34,5 +34,15 @@
 #endif
   ;
 
-#define STACK_CHECK(expected)                                                  \
-	StackUsageCheck<StackMode, expected, __PRETTY_FUNCTION__> stackCheck
+#if defined(__CHERIOT__) && (__CHERIOT__ >= 20250108)
+#	define STACK_CHECK(expected)                                              \
+		static_assert((expected) == __cheriot_minimum_stack__,                 \
+		              "Explicit stack check does not match annotation!");      \
+		StackUsageCheck<StackMode,                                             \
+		                __cheriot_minimum_stack__,                             \
+		                __PRETTY_FUNCTION__>                                   \
+		  stackCheck
+#else
+#	define STACK_CHECK(expected)                                              \
+		StackUsageCheck<StackMode, expected, __PRETTY_FUNCTION__> stackCheck
+#endif