Migrate remaining NOTREACHED()s
NOTREACHED() and NOTREACHED_IN_MIGRATION() are both CHECK-fatal now.
The former is [[noreturn]] so this CL also performs dead-code removal
after the NOTREACHED().
This CL does not attempt to do additional rewrites of any surrounding
code, like:
if (!foo) {
NOTREACHED();
}
to CHECK(foo);
Those transforms take a non-trivial amount of time (and there are
thousands of instances). Cleanup can be left as an exercise for the
reader.
Bug: 40580068
Change-Id: I09f4369db3488ef583e151a8329db1da5f8d7a58
Low-Coverage-Reason: OTHER Should-be-unreachable code
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6020736
Reviewed-by: Lei Zhang <thestig@chromium.org>
Owners-Override: Lei Zhang <thestig@chromium.org>
Commit-Queue: Peter Boström <pbos@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1382750}
NOKEYCHECK=True
GitOrigin-RevId: 76d536e71e4e57e04ee668338ed5f5eeaf85fe04
diff --git a/google/zip_internal.cc b/google/zip_internal.cc
index aa49f45..e6b5a4f 100644
--- a/google/zip_internal.cc
+++ b/google/zip_internal.cc
@@ -165,8 +165,7 @@
// writing compressed data and it returns NULL for this case.)
void* OpenZipBuffer(void* opaque, const void* /*filename*/, int mode) {
if ((mode & ZLIB_FILEFUNC_MODE_READWRITEFILTER) != ZLIB_FILEFUNC_MODE_READ) {
- NOTREACHED_IN_MIGRATION();
- return NULL;
+ NOTREACHED();
}
ZipBuffer* buffer = static_cast<ZipBuffer*>(opaque);
if (!buffer || !buffer->data || !buffer->length)
@@ -196,8 +195,7 @@
void* /*stream*/,
const void* /*buf*/,
uLong /*size*/) {
- NOTREACHED_IN_MIGRATION();
- return 0;
+ NOTREACHED();
}
// Returns the offset from the beginning of the data.
@@ -228,8 +226,7 @@
buffer->offset = std::min(buffer->length, offset);
return 0;
}
- NOTREACHED_IN_MIGRATION();
- return -1;
+ NOTREACHED();
}
// Closes the input offset and deletes all resources used for compressing or
