Module: Mesa Branch: staging/23.0 Commit: 47b2402bdc13fcc8125b96bfae687a38f0f88e2b URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=47b2402bdc13fcc8125b96bfae687a38f0f88e2b
Author: Eric Engestrom <[email protected]> Date: Mon Apr 17 13:01:17 2023 +0100 compiler: fix buggy usage of unreachable() Cc: mesa-stable Signed-off-by: Eric Engestrom <[email protected]> Reviewed-by: Marek Olšák <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22529> (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 ef72f6a67c4..1edc54361ab 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -2544,7 +2544,7 @@ "description": "compiler: fix buggy usage of unreachable()", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/compiler/glsl/ir.cpp b/src/compiler/glsl/ir.cpp index 08b62ddfafb..f11d219e8b8 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);
