From 6c86ffdeb7ca9e308155ef03de9e89d5a5bcbf28 Mon Sep 17 00:00:00 2001 From: Tony Wasserka Date: Mon, 8 Sep 2025 16:32:27 +0200 Subject: [PATCH] Core: Remove redundant nullptr check --- FEXCore/Source/Interface/Core/Core.cpp | 28 ++++++++++++-------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/FEXCore/Source/Interface/Core/Core.cpp b/FEXCore/Source/Interface/Core/Core.cpp index 97f2ea851..74357316c 100644 --- a/FEXCore/Source/Interface/Core/Core.cpp +++ b/FEXCore/Source/Interface/Core/Core.cpp @@ -785,27 +785,25 @@ uintptr_t ContextImpl::CompileBlock(FEXCore::Core::CpuStateFrame* Frame, uint64_ if (Config.BlockJITNaming()) { auto FragmentBasePtr = CompiledCode.BlockBegin; - if (DebugData) { - auto GuestRIPLookup = SyscallHandler->LookupExecutableFileSection(*Thread, GuestRIP); + auto GuestRIPLookup = SyscallHandler->LookupExecutableFileSection(*Thread, GuestRIP); - if (DebugData->Subblocks.size()) { - for (auto& Subblock : DebugData->Subblocks) { - auto BlockBasePtr = FragmentBasePtr + Subblock.HostCodeOffset; - if (GuestRIPLookup) { - Symbols.Register(Thread->SymbolBuffer.get(), BlockBasePtr, CompiledCode.Size, GuestRIPLookup->FileInfo.Filename, - GuestRIP - GuestRIPLookup->FileStartVA); - } else { - Symbols.Register(Thread->SymbolBuffer.get(), BlockBasePtr, GuestRIP, Subblock.HostCodeSize); - } - } - } else { + if (DebugData->Subblocks.size()) { + for (auto& Subblock : DebugData->Subblocks) { + auto BlockBasePtr = FragmentBasePtr + Subblock.HostCodeOffset; if (GuestRIPLookup) { - Symbols.Register(Thread->SymbolBuffer.get(), FragmentBasePtr, CompiledCode.Size, GuestRIPLookup->FileInfo.Filename, + Symbols.Register(Thread->SymbolBuffer.get(), BlockBasePtr, CompiledCode.Size, GuestRIPLookup->FileInfo.Filename, GuestRIP - GuestRIPLookup->FileStartVA); } else { - Symbols.Register(Thread->SymbolBuffer.get(), FragmentBasePtr, GuestRIP, CompiledCode.Size); + Symbols.Register(Thread->SymbolBuffer.get(), BlockBasePtr, GuestRIP, Subblock.HostCodeSize); } } + } else { + if (GuestRIPLookup) { + Symbols.Register(Thread->SymbolBuffer.get(), FragmentBasePtr, CompiledCode.Size, GuestRIPLookup->FileInfo.Filename, + GuestRIP - GuestRIPLookup->FileStartVA); + } else { + Symbols.Register(Thread->SymbolBuffer.get(), FragmentBasePtr, GuestRIP, CompiledCode.Size); + } } }