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