Skip to content

Commit 2fc9a6d

Browse files
committed
CPU/NewRec: Work around clang <16 structured binding capture bug
1 parent 26917f1 commit 2fc9a6d

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

src/core/cpu_newrec_compiler_aarch32.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1676,7 +1676,7 @@ void CPU::NewRec::AArch32Compiler::Compile_lwc2(CompileFlags cf, MemoryAccessSiz
16761676
std::optional<Register>();
16771677
FlushForLoadStore(address, false, use_fastmem);
16781678
const Register addr = ComputeLoadStoreAddressArg(cf, address, addr_reg);
1679-
const Register value = GenerateLoad(addr, MemoryAccessSize::Word, false, use_fastmem, [this, action]() {
1679+
const Register value = GenerateLoad(addr, MemoryAccessSize::Word, false, use_fastmem, [this, action = action]() {
16801680
return (action == GTERegisterAccessAction::CallHandler && g_settings.gpu_pgxp_enable) ?
16811681
Register(AllocateTempHostReg(HR_CALLEE_SAVED)) :
16821682
RRET;

src/core/cpu_newrec_compiler_aarch64.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1655,7 +1655,7 @@ void CPU::NewRec::AArch64Compiler::Compile_lwc2(CompileFlags cf, MemoryAccessSiz
16551655
std::optional<WRegister>();
16561656
FlushForLoadStore(address, false, use_fastmem);
16571657
const WRegister addr = ComputeLoadStoreAddressArg(cf, address, addr_reg);
1658-
const WRegister value = GenerateLoad(addr, MemoryAccessSize::Word, false, use_fastmem, [this, action]() {
1658+
const WRegister value = GenerateLoad(addr, MemoryAccessSize::Word, false, use_fastmem, [this, action = action]() {
16591659
return (action == GTERegisterAccessAction::CallHandler && g_settings.gpu_pgxp_enable) ?
16601660
WRegister(AllocateTempHostReg(HR_CALLEE_SAVED)) :
16611661
RWRET;

src/core/cpu_newrec_compiler_riscv64.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1963,7 +1963,7 @@ void CPU::NewRec::RISCV64Compiler::Compile_lwc2(CompileFlags cf, MemoryAccessSiz
19631963
g_settings.gpu_pgxp_enable ? std::optional<GPR>(GPR(AllocateTempHostReg(HR_CALLEE_SAVED))) : std::optional<GPR>();
19641964
FlushForLoadStore(address, false, use_fastmem);
19651965
const GPR addr = ComputeLoadStoreAddressArg(cf, address, addr_reg);
1966-
const GPR value = GenerateLoad(addr, MemoryAccessSize::Word, false, use_fastmem, [this, action]() {
1966+
const GPR value = GenerateLoad(addr, MemoryAccessSize::Word, false, use_fastmem, [this, action = action]() {
19671967
return (action == GTERegisterAccessAction::CallHandler && g_settings.gpu_pgxp_enable) ?
19681968
GPR(AllocateTempHostReg(HR_CALLEE_SAVED)) :
19691969
RRET;

src/core/cpu_newrec_compiler_x64.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1623,7 +1623,7 @@ void CPU::NewRec::X64Compiler::Compile_lwc2(CompileFlags cf, MemoryAccessSize si
16231623
std::optional<Reg32>();
16241624
FlushForLoadStore(address, false, use_fastmem);
16251625
const Reg32 addr = ComputeLoadStoreAddressArg(cf, address, addr_reg);
1626-
const Reg32 value = GenerateLoad(addr, MemoryAccessSize::Word, false, use_fastmem, [this, action]() {
1626+
const Reg32 value = GenerateLoad(addr, MemoryAccessSize::Word, false, use_fastmem, [this, action = action]() {
16271627
return (action == GTERegisterAccessAction::CallHandler && g_settings.gpu_pgxp_enable) ?
16281628
Reg32(AllocateTempHostReg(HR_CALLEE_SAVED)) :
16291629
RWRET;

0 commit comments

Comments
 (0)