Mesa (master): freedreno/ir3: Fix compiler warning from the setjmp fails path.

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Wed Aug 19 17:22:50 UTC 2020


Module: Mesa
Branch: master
Commit: 803ec06b1b3455cb320e69ae34673be12aef01ec
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=803ec06b1b3455cb320e69ae34673be12aef01ec

Author: Eric Anholt <eric at anholt.net>
Date:   Fri Aug 14 11:56:18 2020 -0700

freedreno/ir3: Fix compiler warning from the setjmp fails path.

The TRY() macro doesn't call the contents if we fail to set up
setjmp/longjmp.

Fixes: 3d6e4a201af0 ("freedreno/decode: try harder to not crash in disasm")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6323>

---

 src/freedreno/ir3/disasm-a3xx.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/freedreno/ir3/disasm-a3xx.c b/src/freedreno/ir3/disasm-a3xx.c
index 29c78ad5e18..02ab47a8875 100644
--- a/src/freedreno/ir3/disasm-a3xx.c
+++ b/src/freedreno/ir3/disasm-a3xx.c
@@ -1709,7 +1709,7 @@ int disasm_a3xx(uint32_t *dwords, int sizedwords, int level, FILE *out, unsigned
 int try_disasm_a3xx(uint32_t *dwords, int sizedwords, int level, FILE *out, unsigned gpu_id)
 {
 	struct shader_stats stats;
-	int ret;
+	int ret = -1;
 	TRY(ret = disasm_a3xx_stat(dwords, sizedwords, level, out, gpu_id, &stats));
 	return ret;
 }



More information about the mesa-commit mailing list