From e18711cda3bf173e03d9773001f641fd85ffd18d Mon Sep 17 00:00:00 2001 From: Rhys Perry Date: Fri, 10 Apr 2020 15:11:03 +0100 Subject: [PATCH] aco: fix p_extract_vector validation MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Rhys Perry Reviewed-by: Daniel Schürmann Part-of: --- src/amd/compiler/aco_validate.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/amd/compiler/aco_validate.cpp b/src/amd/compiler/aco_validate.cpp index 39174971b04..3e0f4584cd3 100644 --- a/src/amd/compiler/aco_validate.cpp +++ b/src/amd/compiler/aco_validate.cpp @@ -261,7 +261,7 @@ void validate(Program* program, FILE * output) } } else if (instr->opcode == aco_opcode::p_extract_vector) { check((instr->operands[0].isTemp()) && instr->operands[1].isConstant(), "Wrong Operand types", instr.get()); - check(instr->operands[1].constantValue() < instr->operands[0].size(), "Index out of range", instr.get()); + check((instr->operands[1].constantValue() + 1) * instr->definitions[0].bytes() <= instr->operands[0].bytes(), "Index out of range", instr.get()); check(instr->definitions[0].getTemp().type() == RegType::vgpr || instr->operands[0].regClass().type() == RegType::sgpr, "Cannot extract SGPR value from VGPR vector", instr.get()); } else if (instr->opcode == aco_opcode::p_parallelcopy) { -- 2.30.2