archive/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-09-20 03:11:51 +02:00
Code Issues Projects Releases Packages Wiki Activity

BranchWatchTableModel: Assume Unreachable Code Truly Is

Browse source
This commit is contained in:
mitaclaw 2024-05-24 17:47:25 -07:00
parent 7dc0bdd5df
commit 8050760fe9
4 changed files with 30 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Source/Core/Common/CMakeLists.txt
View file

@ -143,6 +143,7 @@ add_library(common
TraversalClient.h TraversalClient.h
TraversalProto.h TraversalProto.h
TypeUtils.h TypeUtils.h
Unreachable.h
UPnP.cpp UPnP.cpp
UPnP.h UPnP.h
VariantUtil.h VariantUtil.h

21
Source/Core/Common/Unreachable.h Normal file
View file

@ -0,0 +1,21 @@
// Copyright 2024 Dolphin Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
#include "Common/CommonFuncs.h"
namespace Common
{
// TODO C++23: Replace with std::unreachable.
[[noreturn]] inline void Unreachable()
{
#ifdef _DEBUG
Crash();
#elif defined(_MSC_VER) && !defined(__clang__)
__assume(false);
#else
__builtin_unreachable();
#endif
}
} // namespace Common

1
Source/Core/DolphinLib.props
View file

@ -165,6 +165,7 @@
<ClInclude Include="Common\TraversalClient.h" /> <ClInclude Include="Common\TraversalClient.h" />
<ClInclude Include="Common\TraversalProto.h" /> <ClInclude Include="Common\TraversalProto.h" />
<ClInclude Include="Common\TypeUtils.h" /> <ClInclude Include="Common\TypeUtils.h" />
<ClInclude Include="Common\Unreachable.h" />
<ClInclude Include="Common\UPnP.h" /> <ClInclude Include="Common\UPnP.h" />
<ClInclude Include="Common\VariantUtil.h" /> <ClInclude Include="Common\VariantUtil.h" />
<ClInclude Include="Common\Version.h" /> <ClInclude Include="Common\Version.h" />

10
Source/Core/DolphinQt/Debugger/BranchWatchTableModel.cpp
View file

@ -11,6 +11,7 @@
#include "Common/Assert.h" #include "Common/Assert.h"
#include "Common/GekkoDisassembler.h" #include "Common/GekkoDisassembler.h"
#include "Common/Unreachable.h"
#include "Core/Debugger/BranchWatch.h" #include "Core/Debugger/BranchWatch.h"
#include "Core/PowerPC/PPCSymbolDB.h" #include "Core/PowerPC/PPCSymbolDB.h"
@ -355,7 +356,8 @@ QVariant BranchWatchTableModel::DisplayRoleData(const QModelIndex& index) const
case Column::TotalHits: case Column::TotalHits:
return QString::number(kv->second.total_hits); return QString::number(kv->second.total_hits);
} }
return QVariant(); static_assert(Column::NumberOfColumns == 8);
Common::Unreachable();
} }
QVariant BranchWatchTableModel::FontRoleData(const QModelIndex& index) const QVariant BranchWatchTableModel::FontRoleData(const QModelIndex& index) const
@ -400,7 +402,8 @@ QVariant BranchWatchTableModel::TextAlignmentRoleData(const QModelIndex& index)
case Column::DestinSymbol: case Column::DestinSymbol:
return QVariant::fromValue(Qt::AlignLeft | Qt::AlignVCenter); return QVariant::fromValue(Qt::AlignLeft | Qt::AlignVCenter);
} }
return QVariant(); static_assert(Column::NumberOfColumns == 8);
Common::Unreachable();
} }
QVariant BranchWatchTableModel::ForegroundRoleData(const QModelIndex& index) const QVariant BranchWatchTableModel::ForegroundRoleData(const QModelIndex& index) const
@ -498,5 +501,6 @@ QVariant BranchWatchTableModel::SortRoleData(const QModelIndex& index) const
case Column::TotalHits: case Column::TotalHits:
return qulonglong{kv->second.total_hits}; return qulonglong{kv->second.total_hits};
} }
return QVariant(); static_assert(Column::NumberOfColumns == 8);
Common::Unreachable();
} }