Changeset: e483bc435ce0 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/e483bc435ce0
Modified Files:
gdk/gdk_analytic_bounds.c
gdk/gdk_imprints.c
gdk/gdk_logger.c
gdk/gdk_logger_old.c
gdk/gdk_select.c
Branch: Sep2022
Log Message:
Mark some default cases as MT_UNREACHABLE().
diffs (124 lines):
diff --git a/gdk/gdk_analytic_bounds.c b/gdk/gdk_analytic_bounds.c
--- a/gdk/gdk_analytic_bounds.c
+++ b/gdk/gdk_analytic_bounds.c
@@ -1160,7 +1160,7 @@ GDKanalyticalrangebounds(BAT *r, BAT *b,
break;
}
default:
- assert(0);
+ MT_UNREACHABLE();
}
if (is_lng_nil(limit) || limit < 0 ||
is_int_nil(int_limit) || int_limit < 0) {
goto invalid_bound;
@@ -1444,7 +1444,7 @@ GDKanalyticalwindowbounds(BAT *r, BAT *b
case 2:
return GDKanalyticalgroupsbounds(r, b, p, l, bound, tp2,
preceding);
default:
- assert(0);
+ MT_UNREACHABLE();
}
GDKerror("42000!unit type %d not supported (this is a bug).\n", unit);
return GDK_FAIL;
diff --git a/gdk/gdk_imprints.c b/gdk/gdk_imprints.c
--- a/gdk/gdk_imprints.c
+++ b/gdk/gdk_imprints.c
@@ -124,15 +124,15 @@
#define IMPRINTS_VERSION 2
#define IMPRINTS_HEADER_SIZE 4 /* nr of size_t fields in header */
-#define BINSIZE(B, FUNC, T) \
- do { \
- switch (B) { \
- case 8: FUNC(T,8); break; \
- case 16: FUNC(T,16); break; \
- case 32: FUNC(T,32); break; \
- case 64: FUNC(T,64); break; \
- default: assert(0); break; \
- } \
+#define BINSIZE(B, FUNC, T) \
+ do { \
+ switch (B) { \
+ case 8: FUNC(T,8); break; \
+ case 16: FUNC(T,16); break; \
+ case 32: FUNC(T,32); break; \
+ case 64: FUNC(T,64); break; \
+ default: MT_UNREACHABLE(); break; \
+ } \
} while (0)
@@ -253,7 +253,7 @@ imprints_create(BAT *b, BATiter *bi, voi
break;
default:
/* should never reach here */
- assert(0);
+ MT_UNREACHABLE();
}
*dictcnt = dcnt;
@@ -608,7 +608,7 @@ BATimprints(BAT *b)
break;
default:
/* should never reach here */
- assert(0);
+ MT_UNREACHABLE();
}
imprints_create(b, &bi,
@@ -731,9 +731,7 @@ IMPSgetbin(int tpe, bte bits, const char
break;
}
default:
- assert(0);
- (void) inbins;
- break;
+ MT_UNREACHABLE();
}
return ret;
}
diff --git a/gdk/gdk_logger.c b/gdk/gdk_logger.c
--- a/gdk/gdk_logger.c
+++ b/gdk/gdk_logger.c
@@ -894,7 +894,7 @@ la_apply(logger *lg, logaction *c, int t
ret = la_bat_destroy(lg, c, tid);
break;
default:
- assert(0);
+ MT_UNREACHABLE();
}
return ret;
}
diff --git a/gdk/gdk_logger_old.c b/gdk/gdk_logger_old.c
--- a/gdk/gdk_logger_old.c
+++ b/gdk/gdk_logger_old.c
@@ -936,7 +936,7 @@ la_apply(old_logger *lg, logaction *c)
ret = la_bat_clear(lg, c);
break;
default:
- assert(0);
+ MT_UNREACHABLE();
}
lg->changes += (ret == GDK_SUCCEED);
return ret;
diff --git a/gdk/gdk_select.c b/gdk/gdk_select.c
--- a/gdk/gdk_select.c
+++ b/gdk/gdk_select.c
@@ -420,7 +420,8 @@ quickins(oid *dst, BUN cnt, oid o, BAT *
checkMINMAX(64, TYPE); \
impsmask(ISDENSE,TEST,64); \
break; \
- default: assert(0); break; \
+ default: \
+ MT_UNREACHABLE(); \
} \
} while (false)
@@ -2639,7 +2640,7 @@ rangejoin(BAT *r1, BAT *r2, BAT *l, BAT
default:
ncnt = BUN_NONE;
GDKerror("unsupported type\n");
- assert(0);
+ MT_UNREACHABLE();
}
if (ncnt == BUN_NONE) {
IMPSdecref(imprints, false);
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
