From: Daniel Schürmann <daniel@schuermann.dev>
Date: Thu, 23 Jul 2020 07:41:07 +0000 (+0200)
Subject: aco: prevent infinite recursion in RA for subdword variables
X-Git-Tag: upstream/21.0.0~7235
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4c89bfc4ec0ea29ab757b0391bf646673e483668;p=platform%2Fupstream%2Fmesa.git

aco: prevent infinite recursion in RA for subdword variables

Cc: 20.1 <mesa-stable@lists.freedesktop.org>
Reviewed-by: Rhys Perry <pendingchaos02@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6024>
---

diff --git a/src/amd/compiler/aco_register_allocation.cpp b/src/amd/compiler/aco_register_allocation.cpp
index a59a9af..2fd8d3d 100644
--- a/src/amd/compiler/aco_register_allocation.cpp
+++ b/src/amd/compiler/aco_register_allocation.cpp
@@ -591,7 +591,7 @@ std::pair<PhysReg, bool> get_reg_simple(ra_ctx& ctx,
    RegClass rc = info.rc;
 
    if (stride == 1) {
-
+      info.rc = RegClass(rc.type(), size);
       for (unsigned stride = 8; stride > 1; stride /= 2) {
          if (size % stride)
             continue;