From f2911b79e50a37833ca00072f57632a47a96589e Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Mon, 17 Apr 2023 13:01:17 +0100 Subject: [PATCH] compiler: fix buggy usage of unreachable() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: mesa-stable Signed-off-by: Eric Engestrom Reviewed-by: Marek Olšák Part-of: (cherry picked from commit f5ed1c79ae5d447ab975efe474eaa54899ae16c5) --- .pick_status.json | 2 +- src/compiler/glsl/ir.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 40dc0127ed9..51c47f01c32 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -76,7 +76,7 @@ "description": "compiler: fix buggy usage of unreachable()", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null }, diff --git a/src/compiler/glsl/ir.cpp b/src/compiler/glsl/ir.cpp index 1d65cbcf7ad..811e2950270 100644 --- a/src/compiler/glsl/ir.cpp +++ b/src/compiler/glsl/ir.cpp @@ -574,7 +574,7 @@ ir_expression::ir_expression(int op, ir_rvalue *op0, ir_rvalue *op1) base = GLSL_TYPE_UINT64; break; default: - unreachable(!"Invalid base type."); + unreachable("Invalid base type."); } this->type = glsl_type::get_instance(base, op0->type->vector_elements, 1);