diff options
| author | Eric Engestrom <eric@igalia.com> | 2023-04-17 13:01:17 +0100 |
|---|---|---|
| committer | Eric Engestrom <eric@engestrom.ch> | 2023-04-19 14:37:56 +0100 |
| commit | f2911b79e50a37833ca00072f57632a47a96589e (patch) | |
| tree | 96f022c09898724e4b109318c7584f38b54f8953 | |
| parent | 0a0822e601492a969a38ecb49b175eeecf4ce2f0 (diff) | |
| download | mesa-f2911b79e50a37833ca00072f57632a47a96589e.tar.gz mesa-f2911b79e50a37833ca00072f57632a47a96589e.tar.bz2 mesa-f2911b79e50a37833ca00072f57632a47a96589e.zip | |
compiler: fix buggy usage of unreachable()
Cc: mesa-stable
Signed-off-by: Eric Engestrom <eric@igalia.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22529>
(cherry picked from commit f5ed1c79ae5d447ab975efe474eaa54899ae16c5)
| -rw-r--r-- | .pick_status.json | 2 | ||||
| -rw-r--r-- | 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); |