[前][次][番号順一覧][スレッド一覧]

ruby-changes:66035

From: Nobuyoshi <ko1@a...>
Date: Tue, 4 May 2021 10:12:10 +0900 (JST)
Subject: [ruby-changes:66035] ef406a6c21 (master): Suppress maybe-uninitialized warning by mingw gcc 11

https://git.ruby-lang.org/ruby.git/commit/?id=ef406a6c21

From ef406a6c215d70139364c62a2b4c94dc65e101a4 Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@r...>
Date: Tue, 4 May 2021 10:08:23 +0900
Subject: Suppress maybe-uninitialized warning by mingw gcc 11

---
 thread_win32.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/thread_win32.c b/thread_win32.c
index f4b4ea2..04c4865 100644
--- a/thread_win32.c
+++ b/thread_win32.c
@@ -546,6 +546,17 @@ ruby_init_stack(volatile VALUE *addr) https://github.com/ruby/ruby/blob/trunk/thread_win32.c#L546
 #define CHECK_ERR(expr) \
     {if (!(expr)) {rb_bug("err: %lu - %s", GetLastError(), #expr);}}
 
+COMPILER_WARNING_PUSH
+#if defined(__GNUC__)
+COMPILER_WARNING_IGNORED(-Wmaybe-uninitialized)
+#endif
+static inline SIZE_T
+query_memory_basic_info(PMEMORY_BASIC_INFORMATION mi)
+{
+    return VirtualQuery(mi, mi, sizeof(*mi));
+}
+COMPILER_WARNING_POP
+
 static void
 native_thread_init_stack(rb_thread_t *th)
 {
@@ -553,7 +564,7 @@ native_thread_init_stack(rb_thread_t *th) https://github.com/ruby/ruby/blob/trunk/thread_win32.c#L564
     char *base, *end;
     DWORD size, space;
 
-    CHECK_ERR(VirtualQuery(&mi, &mi, sizeof(mi)));
+    CHECK_ERR(query_memory_basic_info(&mi));
     base = mi.AllocationBase;
     end = mi.BaseAddress;
     end += mi.RegionSize;
-- 
cgit v1.1


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]