From e2e73a5987ee55c9a05fc2e0b8162ca02e2bf8b6 Mon Sep 17 00:00:00 2001 From: dzaima Date: Sat, 31 May 2025 18:55:58 +0300 Subject: [PATCH] always define DEBUG to 1 or 0 --- src/builtins/cells.c | 4 +--- src/core/arrFns.h | 4 ++-- src/core/fillarr.c | 4 +--- src/h.h | 11 +++++------ src/opt/gc.c | 4 +--- 5 files changed, 10 insertions(+), 17 deletions(-) diff --git a/src/builtins/cells.c b/src/builtins/cells.c index 7120d0a0..d05d017d 100644 --- a/src/builtins/cells.c +++ b/src/builtins/cells.c @@ -204,9 +204,7 @@ NOINLINE B leading_axis_arith(FC2 fc2, B w, B x, usz* wsh, usz* xsh, ur mr) { // assert(isArr(w) && isArr(x) && TI(w,elType)!=el_B && TI(x,elType)!=el_B && IA(w)!=0 && IA(x)!=0); ur wr = RNK(w); ur xr = RNK(x); - #if DEBUG - assert(wr!=xr && (mr==wr || mr==xr) && eqShPart(wsh, xsh, mr)); - #endif + if (DEBUG) assert(wr!=xr && (mr==wr || mr==xr) && eqShPart(wsh, xsh, mr)); usz cam = shProd(xsh, 0, mr); B b = mr==wr? x : w; // bigger argument diff --git a/src/core/arrFns.h b/src/core/arrFns.h index 3d02eaf3..8e4bd354 100644 --- a/src/core/arrFns.h +++ b/src/core/arrFns.h @@ -72,13 +72,13 @@ extern u8 const arrTypeBitsLog[]; #define arrNewType(X) el2t(TIi(X,elType)) SHOULD_INLINE void arr_check_size(u64 sz, u8 type, u64 ia) { - #if DEBUG + if (DEBUG) { assert(IS_ANY_ARR(type) || type==t_harrPartial); if (!IS_SLICE(type)) { if (type==t_harr || type==t_harrPartial) assert(sz >= fsizeof(HArr,a,B,ia)); else assert(sz >= offsetof(TyArr,a) + (((ia<>3)); } - #endif + } } // Log of width in bits: max of 7, and also return 7 if not power of 2 SHOULD_INLINE u8 multWidthLog(usz n, u8 lw) { // Of n elements, 1<refc>0); - #endif + if (DEBUG) assert(isVal(x) && v(x)->refc>0); Value* vx = v(x); if(!--vx->refc) value_free(vx); } FORCE_INLINE void ptr_decT(Arr* x) { // assumes argument is an array and consists of non-heap-allocated elements - #if DEBUG - assert(x->refc>0); - #endif + if (DEBUG) assert(x->refc>0); if (x->refc==1) TIv(x,freeT)((Value*) x); else x->refc--; } diff --git a/src/opt/gc.c b/src/opt/gc.c index e7121a1b..ca21fe80 100644 --- a/src/opt/gc.c +++ b/src/opt/gc.c @@ -95,9 +95,7 @@ enum { void gc_onVisit(Value* x) { switch (visit_mode) { default: UD; case GC_DEC_REFC: - #if DEBUG - if(x->refc==0) fatal("decrementing refc 0"); - #endif + if (DEBUG && x->refc==0) fatal("decrementing refc 0"); x->refc--; return;