[Mesa-dev] [PATCH] nir/algebraic: Fix a typo in the bit size validation code

Jason Ekstrand jason at jlekstrand.net
Mon Oct 22 23:31:20 UTC 2018


The conon_bit_class and canon_var_class variables got switched.

Fixes: 932c650e0b "nir/algebraic: Loosen a restriction on variables"
Reported-by: Ian Romanick <ian.d.romanick at intel.com>
---
 src/compiler/nir/nir_algebraic.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/compiler/nir/nir_algebraic.py b/src/compiler/nir/nir_algebraic.py
index b880aa0dc66..033c2298073 100644
--- a/src/compiler/nir/nir_algebraic.py
+++ b/src/compiler/nir/nir_algebraic.py
@@ -362,8 +362,8 @@ class BitSizeValidator(object):
       if var_class == 0:
          self._var_classes[var.index] = bit_class
       else:
-         canon_bit_class = self._class_relation.get_canonical(var_class)
-         canon_var_class = self._class_relation.get_canonical(bit_class)
+         canon_var_class = self._class_relation.get_canonical(var_class)
+         canon_bit_class = self._class_relation.get_canonical(bit_class)
          assert canon_var_class < 0 or canon_bit_class < 0 or \
                 canon_var_class == canon_bit_class, \
                 'Variable {0} cannot be both {1}-bit and {2}-bit' \
-- 
2.19.1



More information about the mesa-dev mailing list