Use NOTREACHED_IN_MIGRATION()

This was generated by replacing "  NOTREACHED()" with
"  NOTREACHED_IN_MIGRATION()" and running git cl format.

This prepares for making NOTREACHED() [[noreturn]] alongside
NotReachedIsFatal migration of existing inventory.

Bug: chromium:40580068
Change-Id: Idb68e2fc8adba180350b0595fd494cf0f206bded
Reviewed-on: https://chromium-review.googlesource.com/c/crashpad/crashpad/+/5548246
Reviewed-by: Mark Mentovai <mark@chromium.org>
Commit-Queue: Peter Boström <pbos@chromium.org>
This commit is contained in:
Peter Boström 2024-05-17 06:53:13 -07:00 committed by Crashpad LUCI CQ
parent efd29a76c9
commit 6af42bc0b2
30 changed files with 74 additions and 73 deletions

View File

@ -765,7 +765,7 @@ class StartHandlerForChildTest : public Multiprocess {
__builtin_trap();
NOTREACHED();
NOTREACHED_IN_MIGRATION();
}
StartHandlerForClientTest test_state_;

View File

@ -123,7 +123,7 @@ bool BinaryPruneCondition::ShouldPruneReport(
case OR:
return lhs_->ShouldPruneReport(report) || rhs_->ShouldPruneReport(report);
default:
NOTREACHED();
NOTREACHED_IN_MIGRATION();
return false;
}
}

View File

@ -292,7 +292,7 @@ FileHandle Settings::GetHandleFromOptions(
return OpenFileForReadAndWrite(
file_path, options.mode, options.permissions);
}
NOTREACHED();
NOTREACHED_IN_MIGRATION();
return kInvalidFileHandle;
}

View File

@ -236,7 +236,7 @@ void CrashReportUploadThread::ProcessPendingReport(
return;
case CrashReportDatabase::kCannotRequestUpload:
NOTREACHED();
NOTREACHED_IN_MIGRATION();
return;
}

View File

@ -40,13 +40,13 @@ DWORD WINAPI Thread1(LPVOID context) {
Sleep(INFINITE);
NOTREACHED();
NOTREACHED_IN_MIGRATION();
return 0;
}
DWORD WINAPI Thread2(LPVOID dummy) {
Sleep(INFINITE);
NOTREACHED();
NOTREACHED_IN_MIGRATION();
return 0;
}
@ -65,7 +65,7 @@ DWORD WINAPI Thread3(LPVOID context) {
if (!FreeLibrary(dll))
PLOG(FATAL) << "FreeLibrary";
NOTREACHED();
NOTREACHED_IN_MIGRATION();
return 0;
}

View File

@ -56,7 +56,7 @@ class TestTypeNames {
if (std::is_same<T, RVA64>()) {
return "RVA64";
}
NOTREACHED();
NOTREACHED_IN_MIGRATION();
return "";
}
};

View File

@ -42,7 +42,7 @@ class TestTypeNames {
if (std::is_same<T, RVA64>()) {
return "RVA64";
}
NOTREACHED();
NOTREACHED_IN_MIGRATION();
return "";
}
};

View File

@ -136,7 +136,7 @@ void MinidumpSystemInfoWriter::InitializeFromSnapshot(
cpu_architecture = kMinidumpCPUArchitectureRISCV64Breakpad;
break;
default:
NOTREACHED();
NOTREACHED_IN_MIGRATION();
cpu_architecture = kMinidumpCPUArchitectureUnknown;
break;
}
@ -185,7 +185,7 @@ void MinidumpSystemInfoWriter::InitializeFromSnapshot(
operating_system = kMinidumpOSIOS;
break;
default:
NOTREACHED();
NOTREACHED_IN_MIGRATION();
operating_system = kMinidumpOSUnknown;
break;
}

View File

@ -174,7 +174,7 @@ uint64_t CPUContext::InstructionPointer() const {
case kCPUArchitectureRISCV64:
return riscv64->pc;
default:
NOTREACHED();
NOTREACHED_IN_MIGRATION();
return ~0ull;
}
}
@ -192,7 +192,7 @@ uint64_t CPUContext::StackPointer() const {
case kCPUArchitectureRISCV64:
return riscv64->regs[1];
default:
NOTREACHED();
NOTREACHED_IN_MIGRATION();
return ~0ull;
}
}
@ -202,12 +202,12 @@ uint64_t CPUContext::ShadowStackPointer() const {
case kCPUArchitectureX86:
case kCPUArchitectureARM:
case kCPUArchitectureARM64:
NOTREACHED();
NOTREACHED_IN_MIGRATION();
return 0;
case kCPUArchitectureX86_64:
return x86_64->xstate.cet_u.ssp;
default:
NOTREACHED();
NOTREACHED_IN_MIGRATION();
return ~0ull;
}
}
@ -221,7 +221,7 @@ bool CPUContext::HasShadowStack() const {
case kCPUArchitectureX86_64:
return x86_64->xstate.cet_u.cetmsr != 0;
default:
NOTREACHED();
NOTREACHED_IN_MIGRATION();
return false;
}
}
@ -238,7 +238,7 @@ bool CPUContext::Is64Bit() const {
case kCPUArchitectureMIPSEL:
return false;
default:
NOTREACHED();
NOTREACHED_IN_MIGRATION();
return false;
}
}

View File

@ -114,7 +114,8 @@ crashpad::ProcessID ProcessSnapshotFuchsia::ProcessID() const {
crashpad::ProcessID ProcessSnapshotFuchsia::ParentProcessID() const {
INITIALIZATION_STATE_DCHECK_VALID(initialized_);
NOTREACHED(); // TODO(scottmg): https://crashpad.chromium.org/bug/196
// TODO(scottmg): https://crashpad.chromium.org/bug/196
NOTREACHED_IN_MIGRATION();
return 0;
}

View File

@ -108,7 +108,7 @@ uint32_t SystemSnapshotFuchsia::CPUX86Signature() const {
#if defined(ARCH_CPU_X86_64)
return cpuid_.Signature();
#else
NOTREACHED();
NOTREACHED_IN_MIGRATION();
return 0;
#endif
}
@ -118,7 +118,7 @@ uint64_t SystemSnapshotFuchsia::CPUX86Features() const {
#if defined(ARCH_CPU_X86_64)
return cpuid_.Features();
#else
NOTREACHED();
NOTREACHED_IN_MIGRATION();
return 0;
#endif
}
@ -128,7 +128,7 @@ uint64_t SystemSnapshotFuchsia::CPUX86ExtendedFeatures() const {
#if defined(ARCH_CPU_X86_64)
return cpuid_.ExtendedFeatures();
#else
NOTREACHED();
NOTREACHED_IN_MIGRATION();
return 0;
#endif
}
@ -137,7 +137,7 @@ uint32_t SystemSnapshotFuchsia::CPUX86Leaf7Features() const {
#if defined(ARCH_CPU_X86_64)
return cpuid_.Leaf7Features();
#else
NOTREACHED();
NOTREACHED_IN_MIGRATION();
return 0;
#endif
}
@ -147,7 +147,7 @@ bool SystemSnapshotFuchsia::CPUX86SupportsDAZ() const {
#if defined(ARCH_CPU_X86_64)
return cpuid_.SupportsDAZ();
#else
NOTREACHED();
NOTREACHED_IN_MIGRATION();
return false;
#endif
}

View File

@ -276,7 +276,7 @@ uint32_t SystemSnapshotLinux::CPUX86Signature() const {
#if defined(ARCH_CPU_X86_FAMILY)
return cpuid_.Signature();
#else
NOTREACHED();
NOTREACHED_IN_MIGRATION();
return 0;
#endif
}
@ -286,7 +286,7 @@ uint64_t SystemSnapshotLinux::CPUX86Features() const {
#if defined(ARCH_CPU_X86_FAMILY)
return cpuid_.Features();
#else
NOTREACHED();
NOTREACHED_IN_MIGRATION();
return 0;
#endif
}
@ -296,7 +296,7 @@ uint64_t SystemSnapshotLinux::CPUX86ExtendedFeatures() const {
#if defined(ARCH_CPU_X86_FAMILY)
return cpuid_.ExtendedFeatures();
#else
NOTREACHED();
NOTREACHED_IN_MIGRATION();
return 0;
#endif
}
@ -306,7 +306,7 @@ uint32_t SystemSnapshotLinux::CPUX86Leaf7Features() const {
#if defined(ARCH_CPU_X86_FAMILY)
return cpuid_.Leaf7Features();
#else
NOTREACHED();
NOTREACHED_IN_MIGRATION();
return 0;
#endif
}
@ -316,7 +316,7 @@ bool SystemSnapshotLinux::CPUX86SupportsDAZ() const {
#if defined(ARCH_CPU_X86_FAMILY)
return cpuid_.SupportsDAZ();
#else
NOTREACHED();
NOTREACHED_IN_MIGRATION();
return false;
#endif // ARCH_CPU_X86_FMAILY
}

View File

@ -196,7 +196,7 @@ thread_state_flavor_t InitializeCPUContextX86Flavor(
}
default: {
NOTREACHED();
NOTREACHED_IN_MIGRATION();
return THREAD_STATE_NONE;
}
}
@ -377,7 +377,7 @@ thread_state_flavor_t InitializeCPUContextX86_64Flavor(
}
default: {
NOTREACHED();
NOTREACHED_IN_MIGRATION();
return THREAD_STATE_NONE;
}
}
@ -553,7 +553,7 @@ thread_state_flavor_t InitializeCPUContextARM64Flavor(
}
default: {
NOTREACHED();
NOTREACHED_IN_MIGRATION();
return THREAD_STATE_NONE;
}
}

View File

@ -204,7 +204,7 @@ uint32_t SystemSnapshotMac::CPUX86Signature() const {
#if defined(ARCH_CPU_X86_FAMILY)
return ReadIntSysctlByName<uint32_t>("machdep.cpu.signature", 0);
#else
NOTREACHED();
NOTREACHED_IN_MIGRATION();
return 0;
#endif
}
@ -215,7 +215,7 @@ uint64_t SystemSnapshotMac::CPUX86Features() const {
#if defined(ARCH_CPU_X86_FAMILY)
return ReadIntSysctlByName<uint64_t>("machdep.cpu.feature_bits", 0);
#else
NOTREACHED();
NOTREACHED_IN_MIGRATION();
return 0;
#endif
}
@ -226,7 +226,7 @@ uint64_t SystemSnapshotMac::CPUX86ExtendedFeatures() const {
#if defined(ARCH_CPU_X86_FAMILY)
return ReadIntSysctlByName<uint64_t>("machdep.cpu.extfeature_bits", 0);
#else
NOTREACHED();
NOTREACHED_IN_MIGRATION();
return 0;
#endif
}
@ -251,7 +251,7 @@ uint32_t SystemSnapshotMac::CPUX86Leaf7Features() const {
CallCPUID(7, &eax, &ebx, &ecx, &edx);
return ebx;
#else
NOTREACHED();
NOTREACHED_IN_MIGRATION();
return 0;
#endif
}
@ -290,7 +290,7 @@ bool SystemSnapshotMac::CPUX86SupportsDAZ() const {
// Test the DAZ bit.
return fxsave.mxcsr_mask & (1 << 6);
#else
NOTREACHED();
NOTREACHED_IN_MIGRATION();
return false;
#endif
}

View File

@ -228,14 +228,14 @@ std::vector<AnnotationSnapshot> ModuleSnapshotMinidump::AnnotationObjects()
std::set<CheckedRange<uint64_t>> ModuleSnapshotMinidump::ExtraMemoryRanges()
const {
INITIALIZATION_STATE_DCHECK_VALID(initialized_);
NOTREACHED(); // https://crashpad.chromium.org/bug/10
NOTREACHED_IN_MIGRATION(); // https://crashpad.chromium.org/bug/10
return std::set<CheckedRange<uint64_t>>();
}
std::vector<const UserMinidumpStream*>
ModuleSnapshotMinidump::CustomMinidumpStreams() const {
INITIALIZATION_STATE_DCHECK_VALID(initialized_);
NOTREACHED(); // https://crashpad.chromium.org/bug/10
NOTREACHED_IN_MIGRATION(); // https://crashpad.chromium.org/bug/10
return std::vector<const UserMinidumpStream*>();
}

View File

@ -135,7 +135,7 @@ crashpad::ProcessID ProcessSnapshotMinidump::ProcessID() const {
crashpad::ProcessID ProcessSnapshotMinidump::ParentProcessID() const {
INITIALIZATION_STATE_DCHECK_VALID(initialized_);
NOTREACHED(); // https://crashpad.chromium.org/bug/10
NOTREACHED_IN_MIGRATION(); // https://crashpad.chromium.org/bug/10
return 0;
}
@ -208,7 +208,7 @@ std::vector<const ModuleSnapshot*> ProcessSnapshotMinidump::Modules() const {
std::vector<UnloadedModuleSnapshot> ProcessSnapshotMinidump::UnloadedModules()
const {
INITIALIZATION_STATE_DCHECK_VALID(initialized_);
NOTREACHED(); // https://crashpad.chromium.org/bug/10
NOTREACHED_IN_MIGRATION(); // https://crashpad.chromium.org/bug/10
return unloaded_modules_;
}
@ -229,7 +229,7 @@ std::vector<const MemoryMapRegionSnapshot*> ProcessSnapshotMinidump::MemoryMap()
std::vector<HandleSnapshot> ProcessSnapshotMinidump::Handles() const {
INITIALIZATION_STATE_DCHECK_VALID(initialized_);
NOTREACHED(); // https://crashpad.chromium.org/bug/10
NOTREACHED_IN_MIGRATION(); // https://crashpad.chromium.org/bug/10
return std::vector<HandleSnapshot>();
}

View File

@ -100,36 +100,36 @@ std::string SystemSnapshotMinidump::CPUVendor() const {
void SystemSnapshotMinidump::CPUFrequency(uint64_t* current_hz,
uint64_t* max_hz) const {
INITIALIZATION_STATE_DCHECK_VALID(initialized_);
NOTREACHED(); // https://crashpad.chromium.org/bug/10
NOTREACHED_IN_MIGRATION(); // https://crashpad.chromium.org/bug/10
}
uint32_t SystemSnapshotMinidump::CPUX86Signature() const {
INITIALIZATION_STATE_DCHECK_VALID(initialized_);
NOTREACHED(); // https://crashpad.chromium.org/bug/10
NOTREACHED_IN_MIGRATION(); // https://crashpad.chromium.org/bug/10
return 0;
}
uint64_t SystemSnapshotMinidump::CPUX86Features() const {
INITIALIZATION_STATE_DCHECK_VALID(initialized_);
NOTREACHED(); // https://crashpad.chromium.org/bug/10
NOTREACHED_IN_MIGRATION(); // https://crashpad.chromium.org/bug/10
return 0;
}
uint64_t SystemSnapshotMinidump::CPUX86ExtendedFeatures() const {
INITIALIZATION_STATE_DCHECK_VALID(initialized_);
NOTREACHED(); // https://crashpad.chromium.org/bug/10
NOTREACHED_IN_MIGRATION(); // https://crashpad.chromium.org/bug/10
return 0;
}
uint32_t SystemSnapshotMinidump::CPUX86Leaf7Features() const {
INITIALIZATION_STATE_DCHECK_VALID(initialized_);
NOTREACHED(); // https://crashpad.chromium.org/bug/10
NOTREACHED_IN_MIGRATION(); // https://crashpad.chromium.org/bug/10
return 0;
}
bool SystemSnapshotMinidump::CPUX86SupportsDAZ() const {
INITIALIZATION_STATE_DCHECK_VALID(initialized_);
NOTREACHED(); // https://crashpad.chromium.org/bug/10
NOTREACHED_IN_MIGRATION(); // https://crashpad.chromium.org/bug/10
return false;
}
@ -178,13 +178,13 @@ std::string SystemSnapshotMinidump::OSVersionFull() const {
std::string SystemSnapshotMinidump::MachineDescription() const {
INITIALIZATION_STATE_DCHECK_VALID(initialized_);
NOTREACHED(); // https://crashpad.chromium.org/bug/10
NOTREACHED_IN_MIGRATION(); // https://crashpad.chromium.org/bug/10
return std::string();
}
bool SystemSnapshotMinidump::NXEnabled() const {
INITIALIZATION_STATE_DCHECK_VALID(initialized_);
NOTREACHED(); // https://crashpad.chromium.org/bug/10
NOTREACHED_IN_MIGRATION(); // https://crashpad.chromium.org/bug/10
return false;
}
@ -194,12 +194,12 @@ void SystemSnapshotMinidump::TimeZone(DaylightSavingTimeStatus* dst_status,
std::string* standard_name,
std::string* daylight_name) const {
INITIALIZATION_STATE_DCHECK_VALID(initialized_);
NOTREACHED(); // https://crashpad.chromium.org/bug/10
NOTREACHED_IN_MIGRATION(); // https://crashpad.chromium.org/bug/10
}
uint64_t SystemSnapshotMinidump::AddressMask() const {
INITIALIZATION_STATE_DCHECK_VALID(initialized_);
NOTREACHED(); // https://crashpad.chromium.org/bug/10
NOTREACHED_IN_MIGRATION(); // https://crashpad.chromium.org/bug/10
return 0;
}

View File

@ -129,7 +129,7 @@ void ChildTestFunction() {
CRASHPAD_CHILD_TEST_MAIN(ChildToBeSanitized) {
ChildTestFunction();
NOTREACHED();
NOTREACHED_IN_MIGRATION();
return EXIT_SUCCESS;
}

View File

@ -360,7 +360,7 @@ uint32_t SystemSnapshotWin::CPUX86Signature() const {
__cpuid(cpu_info, 1);
return cpu_info[0];
#else
NOTREACHED();
NOTREACHED_IN_MIGRATION();
return 0;
#endif
}
@ -375,7 +375,7 @@ uint64_t SystemSnapshotWin::CPUX86Features() const {
return (static_cast<uint64_t>(cpu_info[2]) << 32) |
static_cast<uint64_t>(cpu_info[3]);
#else
NOTREACHED();
NOTREACHED_IN_MIGRATION();
return 0;
#endif
}
@ -391,7 +391,7 @@ uint64_t SystemSnapshotWin::CPUX86ExtendedFeatures() const {
return (static_cast<uint64_t>(cpu_info[2]) << 32) |
static_cast<uint64_t>(cpu_info[3]);
#else
NOTREACHED();
NOTREACHED_IN_MIGRATION();
return 0;
#endif
}
@ -410,7 +410,7 @@ uint32_t SystemSnapshotWin::CPUX86Leaf7Features() const {
__cpuidex(cpu_info, 7, 0);
return cpu_info[1];
#else
NOTREACHED();
NOTREACHED_IN_MIGRATION();
return 0;
#endif
}
@ -441,7 +441,7 @@ bool SystemSnapshotWin::CPUX86SupportsDAZ() const {
// Test the DAZ bit.
return (mxcsr_mask & (1 << 6)) != 0;
#else
NOTREACHED();
NOTREACHED_IN_MIGRATION();
return 0;
#endif
}

View File

@ -90,14 +90,14 @@ ProcessMemoryLinux* FakePtraceConnection::Memory() {
bool FakePtraceConnection::Threads(std::vector<pid_t>* threads) {
// TODO(jperaza): Implement this if/when it's needed.
NOTREACHED();
NOTREACHED_IN_MIGRATION();
return false;
}
ssize_t FakePtraceConnection::ReadUpTo(VMAddress address,
size_t size,
void* buffer) {
NOTREACHED();
NOTREACHED_IN_MIGRATION();
return false;
}

View File

@ -276,7 +276,7 @@ FileHandle StdioFileHandle(StdioStream stdio_stream) {
return STDERR_FILENO;
}
NOTREACHED();
NOTREACHED_IN_MIGRATION();
return kInvalidFileHandle;
}

View File

@ -230,7 +230,7 @@ FileOffset LoggingSeekFile(FileHandle file, FileOffset offset, int whence) {
method = FILE_END;
break;
default:
NOTREACHED();
NOTREACHED_IN_MIGRATION();
break;
}
@ -283,7 +283,7 @@ FileHandle StdioFileHandle(StdioStream stdio_stream) {
standard_handle = STD_ERROR_HANDLE;
break;
default:
NOTREACHED();
NOTREACHED_IN_MIGRATION();
return INVALID_HANDLE_VALUE;
}

View File

@ -56,7 +56,7 @@ bool OutputStreamFileWriter::WriteIoVec(std::vector<WritableIoVec>* iovecs) {
}
FileOffset OutputStreamFileWriter::Seek(FileOffset offset, int whence) {
NOTREACHED();
NOTREACHED_IN_MIGRATION();
return -1;
}

View File

@ -207,7 +207,7 @@ int MacOSVersionNumber() {
#if __MAC_OS_X_VERSION_MIN_REQUIRED >= __MAC_10_13_4
// On macOS 10.13.4 and later, the sysctlbyname above should have been
// successful.
NOTREACHED();
NOTREACHED_IN_MIGRATION();
return -1;
#else // DT >= 10.13.4
// The Darwin major version is always 4 greater than the macOS minor version

View File

@ -256,7 +256,7 @@ mach_port_t ChildPortHandshakeServer::RunServer(
break;
default:
NOTREACHED();
NOTREACHED_IN_MIGRATION();
break;
}
}

View File

@ -123,7 +123,7 @@ kern_return_t UniversalExceptionRaise(exception_behavior_t behavior,
new_state_count);
default:
NOTREACHED();
NOTREACHED_IN_MIGRATION();
return KERN_INVALID_ARGUMENT;
}
}

View File

@ -80,7 +80,7 @@ ExceptionPorts::ExceptionPorts(TargetType target_type, mach_port_t target_port)
break;
default:
NOTREACHED();
NOTREACHED_IN_MIGRATION();
get_exception_ports_ = nullptr;
set_exception_ports_ = nullptr;
target_name_ = nullptr;

View File

@ -188,7 +188,7 @@ class TestExceptionPorts : public MachMultiprocess,
} else if (who_crashes_ == kOtherThreadCrashes) {
expect_behavior = EXCEPTION_STATE_IDENTITY;
} else {
NOTREACHED();
NOTREACHED_IN_MIGRATION();
expect_behavior = 0;
}
@ -286,7 +286,7 @@ class TestExceptionPorts : public MachMultiprocess,
}
default: {
NOTREACHED();
NOTREACHED_IN_MIGRATION();
}
}
}
@ -369,7 +369,7 @@ class TestExceptionPorts : public MachMultiprocess,
break;
}
default: {
NOTREACHED();
NOTREACHED_IN_MIGRATION();
}
}
}
@ -520,7 +520,7 @@ class TestExceptionPorts : public MachMultiprocess,
}
default: {
NOTREACHED();
NOTREACHED_IN_MIGRATION();
}
}
}

View File

@ -92,7 +92,7 @@ class ScopedSpinGuard final {
SleepNanoseconds(kSpinGuardSleepTimeNanos);
}
NOTREACHED();
NOTREACHED_IN_MIGRATION();
}
~ScopedSpinGuard() {

View File

@ -98,7 +98,7 @@ void CheckAce(PACL acl,
mask = label_ace->Mask;
} break;
default:
NOTREACHED();
NOTREACHED_IN_MIGRATION();
break;
}