From faae54eec7b0b017f5792fb6c9da2fb5143dcecc Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Sun, 1 Nov 2026 21:09:00 -0600 Subject: [PATCH 1/2] Core/Debugger: Clean up emplace_back calls with use of "parenthesized initialization of aggregates". --- Source/Core/Core/Debugger/BranchWatch.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/Source/Core/Core/Debugger/BranchWatch.cpp b/Source/Core/Core/Debugger/BranchWatch.cpp index 5f5084562c..d26150e1f6 100644 --- a/Source/Core/Core/Debugger/BranchWatch.cpp +++ b/Source/Core/Core/Debugger/BranchWatch.cpp @@ -118,9 +118,7 @@ void BranchWatch::Load(const CPUThreadGuard& guard, std::FILE* file) if (snapshot_metadata.is_selected) { - // TODO C++20: Parenthesized initialization of aggregates has bad compiler support. - m_selection.emplace_back(BranchWatchSelectionValueType{&*kv_iter, is_virtual, condition, - snapshot_metadata.inspection}); + m_selection.emplace_back(&*kv_iter, is_virtual, condition, snapshot_metadata.inspection); } else if (hits_snapshot != 0) { @@ -144,9 +142,7 @@ void BranchWatch::IsolateHasExecuted(const CPUThreadGuard&) { if (kv.second.hits_snapshot == 0) { - // TODO C++20: Parenthesized initialization of aggregates has bad compiler support. - m_selection.emplace_back( - BranchWatchSelectionValueType{&kv, is_virtual, condition, SelectionInspection{}}); + m_selection.emplace_back(&kv, is_virtual, condition); kv.second.hits_snapshot = kv.second.total_hits; } } From d08bddeaabbfba79f76407018ab02bdf68fa2d46 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Sun, 1 Nov 2026 21:09:38 -0600 Subject: [PATCH 2/2] Common/TypeUtils: Remove missing `__cpp_aggregate_paren_init` feature workaround. --- Source/Core/Common/TypeUtils.h | 6 ------ 1 file changed, 6 deletions(-) diff --git a/Source/Core/Common/TypeUtils.h b/Source/Core/Common/TypeUtils.h index 2e18a411ed..16a40955a3 100644 --- a/Source/Core/Common/TypeUtils.h +++ b/Source/Core/Common/TypeUtils.h @@ -97,13 +97,7 @@ public: T& Construct(Args&&... args) { static_assert(sizeof(ManuallyConstructedValue) == sizeof(T)); - -// TODO: Remove placement-new version when we can require Clang 16. -#if defined(__cpp_aggregate_paren_init) && (__cpp_aggregate_paren_init >= 201902L) return *std::construct_at(&m_value.data, std::forward(args)...); -#else - return *::new (&m_value.data) T{std::forward(args)...}; -#endif } void Destroy() { std::destroy_at(&m_value.data); }