Mesa (staging/20.3): util: Fix pointer to integer conversion error when using libunwind
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Tue Jan 19 17:49:23 UTC 2021
Module: Mesa
Branch: staging/20.3
Commit: e8755481ce13cd187d04469058d0a1db3ff0b6d5
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e8755481ce13cd187d04469058d0a1db3ff0b6d5
Author: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date: Thu Jan 14 10:16:15 2021 -0800
util: Fix pointer to integer conversion error when using libunwind
../src/util/u_debug_stack.c:97:20: error: incompatible pointer to integer conversion assigning to 'unw_word_t' (aka 'unsigned long') from 'void *' [-Werror,-Wint-conversion]
pip.unwind_info = NULL;
^ ~~~~
1 error generated.
Fixes: 70c272004f72 "gallium/util: libunwind support"
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/4094
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8507>
(cherry picked from commit 08ac7b52e7814540e92d5add29049324f6841bb5)
---
.pick_status.json | 2 +-
src/util/u_debug_stack.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.pick_status.json b/.pick_status.json
index 5bfdbe530a0..12018fd4a2b 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -841,7 +841,7 @@
"description": "util: Fix pointer to integer conversion error when using libunwind",
"nominated": true,
"nomination_type": 1,
- "resolution": 0,
+ "resolution": 1,
"master_sha": null,
"because_sha": "70c272004f727457e852ba5f2498754b07a7d995"
},
diff --git a/src/util/u_debug_stack.c b/src/util/u_debug_stack.c
index 21f0371d3c1..01f69e14442 100644
--- a/src/util/u_debug_stack.c
+++ b/src/util/u_debug_stack.c
@@ -94,7 +94,7 @@ debug_backtrace_capture(struct debug_stack_frame *backtrace,
unw_proc_info_t pip;
unsigned i = 0;
- pip.unwind_info = NULL;
+ pip.unwind_info = 0;
unw_getcontext(&context);
unw_init_local(&cursor, &context);
More information about the mesa-commit
mailing list