0

Exclude all hit NOTREACHED()s on iOS M124 stable

Bug: 40580068
Change-Id: Iefa277350f49d3b29c86fa51e5247b69922e408b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5519117
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Owners-Override: Lei Zhang <thestig@chromium.org>
Commit-Queue: Peter Boström <pbos@chromium.org>
Auto-Submit: Peter Boström <pbos@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1297165}
This commit is contained in:
Peter Boström
2024-05-06 22:44:57 +00:00
committed by Chromium LUCI CQ
parent 75cc1a545b
commit 493c8a004b
26 changed files with 48 additions and 38 deletions
base
components
autofill
core
browser
history
password_manager
prefs
safe_browsing
core
browser
security_interstitials
signin
sync
google_apis/gaia
ios/chrome
net

@ -217,8 +217,9 @@ Value::Value(DoubleStorage storage) : data_(std::move(storage)) {}
Value::DoubleStorage::DoubleStorage(double v) : v_(bit_cast<decltype(v_)>(v)) {
if (!std::isfinite(v)) {
NOTREACHED() << "Non-finite (i.e. NaN or positive/negative infinity) "
<< "values cannot be represented in JSON";
DUMP_WILL_BE_NOTREACHED_NORETURN()
<< "Non-finite (i.e. NaN or positive/negative infinity) "
<< "values cannot be represented in JSON";
v_ = bit_cast<decltype(v_)>(0.0);
}
}

@ -786,7 +786,7 @@ bool AutofillProfile::MergeDataFrom(const AutofillProfile& profile,
!comparator.MergeCompanyNames(profile, *this, company) ||
!comparator.MergePhoneNumbers(profile, *this, phone_number) ||
!comparator.MergeAddresses(profile, *this, address)) {
NOTREACHED();
DUMP_WILL_BE_NOTREACHED_NORETURN();
return false;
}

@ -2922,7 +2922,7 @@ void HistoryBackend::GetRedirectsFromSpecificVisit(VisitID cur_visit,
visit_set.insert(cur_visit);
while (db_->GetRedirectFromVisit(cur_visit, &cur_visit, &cur_url)) {
if (visit_set.find(cur_visit) != visit_set.end()) {
NOTREACHED() << "Loop in visit chain, giving up";
DUMP_WILL_BE_NOTREACHED_NORETURN() << "Loop in visit chain, giving up";
return;
}
visit_set.insert(cur_visit);
@ -2943,7 +2943,7 @@ void HistoryBackend::GetRedirectsToSpecificVisit(VisitID cur_visit,
visit_set.insert(cur_visit);
while (db_->GetRedirectToVisit(cur_visit, &cur_visit, &cur_url)) {
if (visit_set.find(cur_visit) != visit_set.end()) {
NOTREACHED() << "Loop in visit chain, giving up";
DUMP_WILL_BE_NOTREACHED_NORETURN() << "Loop in visit chain, giving up";
return;
}
visit_set.insert(cur_visit);

@ -28,7 +28,7 @@ bool InMemoryDatabase::InitDB() {
// Create the URL table, but leave it empty for now.
if (!CreateURLTable(false)) {
NOTREACHED() << "Unable to create table";
DUMP_WILL_BE_NOTREACHED_NORETURN() << "Unable to create table";
db_.Close();
return false;
}

@ -276,7 +276,7 @@ bool URLDatabase::CommitTemporaryURLTable() {
// Swap the url table out and replace it with the temporary one.
if (!GetDB().Execute("DROP TABLE urls")) {
NOTREACHED() << GetDB().GetErrorMessage();
DUMP_WILL_BE_NOTREACHED_NORETURN() << GetDB().GetErrorMessage();
return false;
}
if (!GetDB().Execute("ALTER TABLE temp_urls RENAME TO urls")) {
@ -759,7 +759,7 @@ bool URLDatabase::RecreateURLTableWithAllContents() {
"recreate_url_table_description");
error_message_crash_key.Set(error_message);
}
NOTREACHED() << error_message;
DUMP_WILL_BE_NOTREACHED_NORETURN() << error_message;
return false;
}

@ -142,7 +142,7 @@ std::vector<UsernameAndRealm> AccountSelectFillData::RetrieveSuggestions(
std::unique_ptr<FillData> AccountSelectFillData::GetFillData(
const std::u16string& username) const {
if (!last_requested_form_) {
NOTREACHED();
DUMP_WILL_BE_NOTREACHED_NORETURN();
return nullptr;
}

@ -516,7 +516,8 @@ base::Value* PrefService::GetMutableUserPref(const std::string& path,
const Preference* pref = FindPreference(path);
if (!pref) {
NOTREACHED() << "Trying to get an unregistered pref: " << path;
DUMP_WILL_BE_NOTREACHED_NORETURN()
<< "Trying to get an unregistered pref: " << path;
return nullptr;
}
if (pref->GetType() != type) {
@ -561,7 +562,8 @@ void PrefService::SetUserPrefValue(const std::string& path,
const Preference* pref = FindPreference(path);
if (!pref) {
NOTREACHED() << "Trying to write an unregistered pref: " << path;
DUMP_WILL_BE_NOTREACHED_NORETURN()
<< "Trying to write an unregistered pref: " << path;
return;
}
if (pref->GetType() != new_value.type()) {

@ -131,7 +131,7 @@ V4DecodeResult V4RiceDecoder::DecodePrefixes(const int64 first_value,
last_value += offset;
if (!last_value.IsValid()) {
NOTREACHED();
DUMP_WILL_BE_NOTREACHED_NORETURN();
return DECODED_INTEGER_OVERFLOW_FAILURE;
}

@ -254,7 +254,7 @@ void SSLErrorUI::HandleCommand(SecurityInterstitialCommand command) {
case CMD_CLOSE_INTERSTITIAL_WITHOUT_UI:
case CMD_REQUEST_SITE_ACCESS_PERMISSION: {
// Not supported by the SSL error page.
NOTREACHED() << "Unsupported command: " << command;
DUMP_WILL_BE_NOTREACHED_NORETURN() << "Unsupported command: " << command;
break;
}
case CMD_ERROR:

@ -45,8 +45,8 @@ bool TokenServiceTable::CreateTablesIfNecessary() {
if (!db_->Execute("CREATE TABLE token_service ("
"service VARCHAR PRIMARY KEY NOT NULL,"
"encrypted_token BLOB)")) {
NOTREACHED();
LOG(ERROR) << "Failed creating token_service table";
DUMP_WILL_BE_NOTREACHED_NORETURN()
<< "Failed creating token_service table";
return false;
}
}

@ -258,7 +258,7 @@ void SyncServiceCrypto::SetEncryptionPassphrase(const std::string& passphrase) {
// TODO(crbug.com/40904402): this is currently reachable on iOS due to
// discrepancy in UI code. Fix iOS implementation and avoid using more
// strict checks here until this is done.
NOTREACHED()
DUMP_WILL_BE_NOTREACHED_NORETURN()
<< "Can not set explicit passphrase when decryption is needed.";
return;
}

@ -100,7 +100,8 @@ std::string ExtractDomainName(std::string_view email_address) {
separator_pos < email.length() - 1) {
return email.substr(separator_pos + 1);
} else {
NOTREACHED() << "Not a proper email address: " << email;
DUMP_WILL_BE_NOTREACHED_NORETURN()
<< "Not a proper email address: " << email;
}
return std::string();
}

@ -104,7 +104,7 @@ Domain SpotlightDomainFromString(NSString* domain) {
}
// On normal flow, it is not possible to reach this point. When testing the
// app, it may be possible though if the app is downgraded.
NOTREACHED();
DUMP_WILL_BE_NOTREACHED_NORETURN();
return DOMAIN_UNKNOWN;
}

@ -97,7 +97,7 @@ bool LinkToTextTabHelper::ShouldOffer() {
if (!textInputView) {
LogShouldOfferResult(ShouldOfferResult::kTextInputNotFound);
NOTREACHED();
DUMP_WILL_BE_NOTREACHED_NORETURN();
return false;
}

@ -40,8 +40,7 @@ void ReportInvalidReferrerSend(const GURL& target_url,
// Record information to help debug http://crbug.com/422871
if (!target_url.SchemeIsHTTPOrHTTPS())
return;
base::debug::DumpWithoutCrashing();
NOTREACHED();
DUMP_WILL_BE_NOTREACHED_NORETURN();
}
} // namespace

@ -3565,7 +3565,8 @@ using UserFeedbackDataCallback =
}
case AuthenticationService::ServiceStatus::SigninDisabledByInternal:
case AuthenticationService::ServiceStatus::SigninDisabledByUser: {
NOTREACHED() << "Status service: " << static_cast<int>(statusService);
DUMP_WILL_BE_NOTREACHED_NORETURN()
<< "Status service: " << static_cast<int>(statusService);
break;
}
}

@ -27,7 +27,7 @@ const base::FilePath::CharType kProductDirName[] =
bool GetDefaultUserDataDirectory(base::FilePath* result) {
if (!base::PathService::Get(base::DIR_APP_DATA, result)) {
NOTREACHED();
DUMP_WILL_BE_NOTREACHED_NORETURN();
return false;
}
*result = result->Append(kProductDirName);

@ -88,8 +88,9 @@ void MoveTabToBrowser(web::WebStateID tab_id,
BrowserAndIndex tab_info = FindBrowserAndIndex(tab_id, browsers);
if (!tab_info.browser) {
NOTREACHED() << "Either the tab_id is incorrect, or the user is attempting "
"to move a tab across profiles (incognito <-> regular)";
DUMP_WILL_BE_NOTREACHED_NORETURN()
<< "Either the tab_id is incorrect, or the user is attempting "
"to move a tab across profiles (incognito <-> regular)";
return;
}
MoveTabFromBrowserToBrowser(tab_info.browser, tab_info.tab_index,
@ -143,7 +144,7 @@ void MoveTabGroupToBrowser(const TabGroup* source_tab_group,
}
if (!source_browser) {
NOTREACHED()
DUMP_WILL_BE_NOTREACHED_NORETURN()
<< "Either the 'source_tab_group' is incorrect, or the user is "
"attempting to move a tab group across profiles (incognito <-> "
"regular)";

@ -1687,7 +1687,7 @@ std::vector<GURL> GetUrlsToOpen(const std::vector<const BookmarkNode*>& nodes) {
return nodeItem.bookmarkNode;
}
NOTREACHED() << "Unexpected item type " << item.type;
DUMP_WILL_BE_NOTREACHED_NORETURN() << "Unexpected item type " << item.type;
return nullptr;
}

@ -300,8 +300,9 @@ const NSUInteger kMaxSuggestTileTypePosition = 15;
_delegate->OnMatchSelected(match, row, WindowOpenDisposition::CURRENT_TAB);
} else {
NOTREACHED() << "Suggestion type " << NSStringFromClass(suggestion.class)
<< " not handled for selection.";
DUMP_WILL_BE_NOTREACHED_NORETURN()
<< "Suggestion type " << NSStringFromClass(suggestion.class)
<< " not handled for selection.";
}
}
@ -342,8 +343,9 @@ const NSUInteger kMaxSuggestTileTypePosition = 15;
autocompleteMatchFormatter.autocompleteMatch;
_delegate->OnMatchSelectedForDeletion(match);
} else {
NOTREACHED() << "Suggestion type " << NSStringFromClass(suggestion.class)
<< " not handled for deletion.";
DUMP_WILL_BE_NOTREACHED_NORETURN()
<< "Suggestion type " << NSStringFromClass(suggestion.class)
<< " not handled for deletion.";
}
}

@ -302,7 +302,7 @@ typedef NS_ENUM(NSInteger, ModelLoadStatus) {
case ItemTypeOnDeviceEncryptionOptInDescription:
case ItemTypeSavePasswordsSwitch:
case ItemTypeManagedSavePasswords: {
NOTREACHED();
DUMP_WILL_BE_NOTREACHED_NORETURN();
}
}
[tableView deselectRowAtIndexPath:indexPath animated:YES];

@ -449,7 +449,7 @@ const CGFloat kActivityIndicatorDimensionIPhone = 56;
[self.navigationItem.leftBarButtonItem setEnabled:YES];
break;
default:
NOTREACHED();
DUMP_WILL_BE_NOTREACHED_NORETURN();
break;
}
self.savedBarButtonItem = nil;

@ -1053,12 +1053,14 @@ bool FindNavigatorShouldBePresentedInBrowser(Browser* browser) {
activeBrowser = self.regularBrowser;
break;
case TabGridPageRemoteTabs:
NOTREACHED() << "It is invalid to have an active tab in Recent Tabs.";
DUMP_WILL_BE_NOTREACHED_NORETURN()
<< "It is invalid to have an active tab in Recent Tabs.";
// This appears to come up in release -- see crbug.com/1069243.
// Defensively early return instead of continuing.
return;
case TabGridPageTabGroups:
NOTREACHED() << "It is invalid to have an active tab in Tab Groups.";
DUMP_WILL_BE_NOTREACHED_NORETURN()
<< "It is invalid to have an active tab in Tab Groups.";
// This may come up in release -- see crbug.com/1069243.
// Defensively early return instead of continuing.
return;

@ -68,7 +68,7 @@
// File has not been created, return a fresh mutable set.
return [[NSMutableDictionary alloc] init];
}
NOTREACHED();
DUMP_WILL_BE_NOTREACHED_NORETURN();
}
NSData* data = [NSData dataWithContentsOfURL:self.fileURL
options:0

@ -419,7 +419,7 @@ void Eviction::OnCreateEntryV2(EntryImpl* entry) {
break;
};
default:
NOTREACHED();
DUMP_WILL_BE_NOTREACHED_NORETURN();
}
rankings_->Insert(entry->rankings(), true, GetListForEntryV2(entry));

@ -228,7 +228,8 @@ bool SQLitePersistentStoreBackendBase::MigrateDatabaseSchema() {
base::UmaHistogramBoolean(histogram_tag_ + ".CorruptMetaTableRecovered",
recovered);
if (!recovered) {
NOTREACHED() << "Unable to reset the " << histogram_tag_ << " DB.";
DUMP_WILL_BE_NOTREACHED_NORETURN()
<< "Unable to reset the " << histogram_tag_ << " DB.";
meta_table_.Reset();
db_.reset();
return false;