silence some warnings & errors in various build types

This commit is contained in:
dzaima 2023-11-12 23:37:47 +02:00
parent 09572de49a
commit 5910c93fcb

View File

@ -82,7 +82,7 @@ extern B join_c2(B,B,B);
extern B select_c2(B,B,B); extern B select_c2(B,B,B);
B asNormalized(B x, usz n, bool nanBad); B asNormalized(B x, usz n, bool nanBad);
SHOULD_INLINE bool canCompare64_norm(B* w, usz wia, B* x, usz xia) { SHOULD_INLINE bool canCompare64_norm2(B* w, usz wia, B* x, usz xia) {
B wn=asNormalized(*w,wia,true); if (wn.u == m_f64(0).u) return 0; *w=wn; B wn=asNormalized(*w,wia,true); if (wn.u == m_f64(0).u) return 0; *w=wn;
B xn=asNormalized(*x,xia,true); if (xn.u == m_f64(0).u) return 0; *x=xn; B xn=asNormalized(*x,xia,true); if (xn.u == m_f64(0).u) return 0; *x=xn;
return 1; return 1;
@ -244,7 +244,7 @@ static NOINLINE usz indexOfOne(B l, B e) {
} else } else
B indexOf_c2(B t, B w, B x) { B indexOf_c2(B t, B w, B x) {
bool split = 0; bool split = 0; (void) split;
if (RARE(!isArr(w) || RNK(w)!=1)) { if (RARE(!isArr(w) || RNK(w)!=1)) {
split = 1; split = 1;
B2 t = splitCells(x, w, 1); B2 t = splitCells(x, w, 1);
@ -331,7 +331,7 @@ B indexOf_c2(B t, B w, B x) {
return r; return r;
} }
#if SINGELI #if SINGELI
if (we==xe && (we==el_i32 || (we==el_f64 && (split || canCompare64_norm(&w,wia,&x,xia))))) { if (we==xe && (we==el_i32 || (we==el_f64 && (split || canCompare64_norm2(&w,wia,&x,xia))))) {
i32* rp; B r = m_i32arrc(&rp, x); i32* rp; B r = m_i32arrc(&rp, x);
if (si_indexOf_c2_hash[we-el_i32](rp, tyany_ptr(w), wia, tyany_ptr(x), xia)) { if (si_indexOf_c2_hash[we-el_i32](rp, tyany_ptr(w), wia, tyany_ptr(x), xia)) {
decG(w); decG(x); return reduceI32Width(r, wia); decG(w); decG(x); return reduceI32Width(r, wia);
@ -357,7 +357,7 @@ B indexOf_c2(B t, B w, B x) {
B enclosed_0, enclosed_1; B enclosed_0, enclosed_1;
B memberOf_c2(B t, B w, B x) { B memberOf_c2(B t, B w, B x) {
bool split = 0; bool split = 0; (void) split;
if (isAtm(x) || RNK(x)!=1) { if (isAtm(x) || RNK(x)!=1) {
split = 1; split = 1;
B2 t = splitCells(w, x, false); B2 t = splitCells(w, x, false);
@ -438,7 +438,7 @@ B memberOf_c2(B t, B w, B x) {
return taga(cpyBitArr(r)); return taga(cpyBitArr(r));
} }
#if SINGELI #if SINGELI
if (we==xe && (we==el_i32 || (we==el_f64 && (split || canCompare64_norm(&w,wia,&x,xia))))) { if (we==xe && (we==el_i32 || (we==el_f64 && (split || canCompare64_norm2(&w,wia,&x,xia))))) {
i8* rp; B r = m_i8arrc(&rp, w); i8* rp; B r = m_i8arrc(&rp, w);
if (si_memberOf_c2_hash[we-el_i32](rp, tyany_ptr(x), xia, tyany_ptr(w), wia)) { if (si_memberOf_c2_hash[we-el_i32](rp, tyany_ptr(x), xia, tyany_ptr(w), wia)) {
decG(w); decG(x); return taga(cpyBitArr(r)); decG(w); decG(x); return taga(cpyBitArr(r));
@ -465,7 +465,7 @@ B memberOf_c2(B t, B w, B x) {
#undef CHECK_CHRS_ELSE #undef CHECK_CHRS_ELSE
B count_c2(B t, B w, B x) { B count_c2(B t, B w, B x) {
bool split = 0; bool split = 0; (void) split;
if (RARE(!isArr(w) || RNK(w)!=1)) { if (RARE(!isArr(w) || RNK(w)!=1)) {
split = 1; split = 1;
B2 t = splitCells(x, w, 2); B2 t = splitCells(x, w, 2);
@ -508,7 +508,7 @@ B count_c2(B t, B w, B x) {
goto el8or16; goto el8or16;
} else { } else {
#if SINGELI #if SINGELI
if (we==xe && (we==el_i32 || (we==el_f64 && (split || canCompare64_norm(&w,wia,&x,xia)))) && if (we==xe && (we==el_i32 || (we==el_f64 && (split || canCompare64_norm2(&w,wia,&x,xia)))) &&
si_count_c2_hash[we-el_i32](rp, tyany_ptr(w), wia, tyany_ptr(x), xia, wnext)) { si_count_c2_hash[we-el_i32](rp, tyany_ptr(w), wia, tyany_ptr(x), xia, wnext)) {
goto dec_nwx; goto dec_nwx;
} }
@ -529,7 +529,9 @@ B count_c2(B t, B w, B x) {
} }
free_b2i(map); free_b2i(map);
} }
#if SINGELI
dec_nwx:; dec_nwx:;
#endif
TFREE(wnext); decG(w); decG(x); TFREE(wnext); decG(w); decG(x);
return reduceI32Width(r, wia); return reduceI32Width(r, wia);
} }