From 3455d45ec3ca5e3174cddeb7aa0797ce9456a5f3 Mon Sep 17 00:00:00 2001
From: Rene Rivera <grafikrobot@gmail.com>
Date: Thu, 14 Apr 2022 21:51:37 -0500
Subject: [PATCH] Debug CI 17/n [skip ci]

---
 src/engine/debug.h      |  2 +-
 src/engine/function.cpp | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/engine/debug.h b/src/engine/debug.h
index 722124a50..115135ef3 100644
--- a/src/engine/debug.h
+++ b/src/engine/debug.h
@@ -65,7 +65,7 @@ OBJECT * profile_make_local( char const * );
 #define b2_cbreak(test) \
     if ( !static_cast<bool>( test ) ) \
     { \
-        err_printf("%s: %d: %s: Assertion '%s' failed.\n"); \
+        err_printf("%s: %d: %s: Assertion '%s' failed.\n", __FILE__, __LINE__, __FUNCTION__, #test); \
         err_flush(); \
         psnip_trap(); \
     } \
diff --git a/src/engine/function.cpp b/src/engine/function.cpp
index 610b07eea..ec6048482 100644
--- a/src/engine/function.cpp
+++ b/src/engine/function.cpp
@@ -24,7 +24,6 @@
 #include "variable.h"
 #include "output.h"
 #include "startup.h"
-#include "debug.h"
 
 #include <assert.h>
 #include <errno.h>
@@ -387,9 +386,11 @@ struct _stack
     remove_cref_t<T> * nth( int32_t n )
     {
         using U = remove_cref_t<T>;
-        b2_cbreak( ((ptrdiff_t)data) > (1<<4) );
+        assert( n > -1000 );
+        assert( n < 1000 );
+        assert( ((ptrdiff_t)data) > (1<<4) );
         remove_cref_t<T> * result = &( static_cast<U*>( data )[n] );
-        b2_cbreak( ((ptrdiff_t)result) > (1<<4) );
+        assert( ((ptrdiff_t)result) > (1<<4) );
         return result;
     }
 
@@ -419,11 +420,11 @@ struct _stack
     template <typename...R>
     static void * advance(void * p)
     {
-        b2_cbreak( ((ptrdiff_t)p) > (1<<4) );
+        assert( ((ptrdiff_t)p) > (1<<4) );
         p = static_cast<char*>(p)
             + sum_advance_size<R...>::value
             - advance_size< select_last_t<R...> >::value;
-        b2_cbreak( ((ptrdiff_t)p) > (1<<4) );
+        assert( ((ptrdiff_t)p) > (1<<4) );
         return p;
     }
 
@@ -463,7 +464,7 @@ remove_cref_t<T> * _stack::push( T v, int32_t n )
     data = nth<T>( -n );
     check_alignment();
     std::uninitialized_fill_n( static_cast<U*>( data ), n, v );
-    b2_cbreak( ((ptrdiff_t)data) > (1<<4) );
+    assert( ((ptrdiff_t)data) > (1<<4) );
     cleanup_push<U>( n );
     return static_cast<U*>( data );
 }