From 2182bbf84f0f19846a47f0438ec702f4d862731e Mon Sep 17 00:00:00 2001 From: Tony Wasserka Date: Wed, 2 Sep 2020 18:28:36 +0200 Subject: [PATCH] aco: Fix integer overflows when emitting parallel copies during RA MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 32-bit shifts were accidentally used before this change despite the intended output being 64 bits. This was observed when compiling Dolphin's ubershaders. Cc: mesa-stable Reviewed-by: Bas Nieuwenhuizen Reviewed-by: Daniel Schürmann Part-of: --- src/amd/compiler/aco_register_allocation.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/amd/compiler/aco_register_allocation.cpp b/src/amd/compiler/aco_register_allocation.cpp index ca7a0fa4815..d5746e5a636 100644 --- a/src/amd/compiler/aco_register_allocation.cpp +++ b/src/amd/compiler/aco_register_allocation.cpp @@ -2235,11 +2235,11 @@ void register_allocation(Program *program, std::vector& live_out_per_bl if (!sgpr_operands_alias_defs) { unsigned reg = parallelcopy[i].first.physReg().reg(); unsigned size = parallelcopy[i].first.getTemp().size(); - sgpr_operands[reg / 64u] |= ((1u << size) - 1) << (reg % 64u); + sgpr_operands[reg / 64u] |= u_bit_consecutive64(reg % 64u, size); reg = parallelcopy[i].second.physReg().reg(); size = parallelcopy[i].second.getTemp().size(); - if (sgpr_operands[reg / 64u] & ((1u << size) - 1) << (reg % 64u)) + if (sgpr_operands[reg / 64u] & u_bit_consecutive64(reg % 64u, size)) sgpr_operands_alias_defs = true; } } -- 2.30.2