From 085678a75e956b9b7b6015c79b448095cd7d406c Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Mon, 16 Nov 2020 15:36:25 +0100 Subject: [PATCH] Mark two impossible code-paths with Q_UNREACHABLE MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I8c04f512b078d4c13d759854b65f4d39b7b80e75 Reviewed-by: Mårten Nordheim Reviewed-by: Andrei Golubev --- src/corelib/text/qlocale.cpp | 2 +- src/corelib/text/qlocale_tools.cpp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/corelib/text/qlocale.cpp b/src/corelib/text/qlocale.cpp index a3429ec9f8..3ce1f501c4 100644 --- a/src/corelib/text/qlocale.cpp +++ b/src/corelib/text/qlocale.cpp @@ -558,7 +558,7 @@ bool qt_splitLocaleName(QStringView name, QStringView *lang, QStringView *script state = NoState; break; case NoState: // Precluded by loop condition ! - Q_ASSERT(!"QLocale: This should never happen"); + Q_UNREACHABLE(); break; } } diff --git a/src/corelib/text/qlocale_tools.cpp b/src/corelib/text/qlocale_tools.cpp index 4421d40340..a8f63a5998 100644 --- a/src/corelib/text/qlocale_tools.cpp +++ b/src/corelib/text/qlocale_tools.cpp @@ -530,7 +530,8 @@ QString qulltoa(qulonglong number, int base, const QStringView zero) number /= base; } - } else { + } else { // zero should always be either a non-surrogate or a surrogate pair: + Q_UNREACHABLE(); return QString(); }