From ab468e1e0b9897ecaaabd4cfdd9e1cfc5b898cf2 Mon Sep 17 00:00:00 2001 From: Jonathan Gray Date: Sat, 12 Mar 2022 11:08:56 +1100 Subject: [PATCH] util: fix msvc build Fix msvc build regression after 0536b691338f2759b850f9ec94634033a5d1f9e1 reported by Prodea Alexandru-Liviu. Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/6137 Fixes: 0536b691338 ("util: fix build with clang 10 on mips64") Reviewed-by: Ilia Mirkin Part-of: (cherry picked from commit e50eb1ce7ab3bbbb71a4cb9016a2e41d0a30e08f) --- .pick_status.json | 2 +- src/util/u_debug_stack.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 8dc2792d163..f05b8bff466 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -436,7 +436,7 @@ "description": "util: fix msvc build", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "0536b691338f2759b850f9ec94634033a5d1f9e1" }, diff --git a/src/util/u_debug_stack.c b/src/util/u_debug_stack.c index 86bfb2fb64b..9042effc364 100644 --- a/src/util/u_debug_stack.c +++ b/src/util/u_debug_stack.c @@ -256,10 +256,11 @@ debug_backtrace_capture(struct debug_stack_frame *backtrace, const void **frame_pointer = ((const void **)__builtin_frame_address(1)); #pragma GCC diagnostic pop #elif defined(PIPE_CC_MSVC) + const void **frame_pointer; __asm { mov frame_pointer, ebp } - const void **frame_pointer = (const void **)frame_pointer[0]; + frame_pointer = (const void **)frame_pointer[0]; #else const void **frame_pointer = NULL; #endif