fix some compile time warnings on windows

Author: timfel

graalpython/com.oracle.graal.python.cext/CAPIFunctions.txt

@@ -41,8 +41,8 @@ _Py_FatalErrorFunc;void;const char*|const char*
 _Py_FdIsInteractive;int;FILE*|PyObject*
 _Py_fopen_obj;FILE*;PyObject*|const char*
 _Py_FreeCharPArray;void;char*const []
-_Py_fstat_noraise;int;int|struct stat*
-_Py_fstat;int;int|struct stat*
+_Py_fstat_noraise;int;int|struct _Py_stat_struct*
+_Py_fstat;int;int|struct _Py_stat_struct*
 _Py_get_blocking;int;int
 _Py_get_inheritable;int;int
 _Py_GetAllocatedBlocks;Py_ssize_t;void

graalpython/com.oracle.graal.python.cext/src/modsupport_shared.c

@@ -231,8 +231,7 @@ static int
 parser_init(struct _PyArg_Parser *parser)
 {
     const char * const *keywords;
-    const char *format, *msg;
-    int i, len, min, max, nkw;
+    int i, len, nkw;
     PyObject *kwtuple;
 
     assert(parser->keywords != NULL);

graalpython/com.oracle.graal.python.jni/src/capi_forwards.h

@@ -6079,10 +6079,10 @@ PyAPI_FUNC(int) _Py_dup(int a) {
 PyAPI_FUNC(FILE*) _Py_fopen_obj(PyObject* a, const char* b) {
     unimplemented("_Py_fopen_obj"); exit(-1);
 }
-PyAPI_FUNC(int) _Py_fstat(int a, struct stat* b) {
+PyAPI_FUNC(int) _Py_fstat(int a, struct _Py_stat_struct* b) {
     unimplemented("_Py_fstat"); exit(-1);
 }
-PyAPI_FUNC(int) _Py_fstat_noraise(int a, struct stat* b) {
+PyAPI_FUNC(int) _Py_fstat_noraise(int a, struct _Py_stat_struct* b) {
     unimplemented("_Py_fstat_noraise"); exit(-1);
 }
 PyAPI_FUNC(int) _Py_get_blocking(int a) {

graalpython/com.oracle.graal.python.jni/src/ctx_tracker.c

@@ -170,7 +170,6 @@ _HPy_HIDDEN void
 ctx_Tracker_Close_jni(HPyContext *ctx, HPyTracker ht)
 {
     _HPyTracker_s *hp = _ht2hp(ht);
-    HPy_ssize_t i;
     upcallBulkClose(ctx, hp->handles, hp->length);
     free(hp->handles);
     free(hp);

graalpython/com.oracle.graal.python.jni/src/hpy_jni.c

@@ -104,7 +104,7 @@ static int32_t unclosedHandleTop = 0;
 static HPy unclosedHandles[MAX_UNCLOSED_HANDLES];
 
 static inline jsize get_handle_table_size(HPyContext *ctx) {
-    return HANDLE_TABLE_SIZE(ctx->_private);
+    return (jsize)HANDLE_TABLE_SIZE(ctx->_private);
 }
 
 static uint64_t get_hpy_handle_for_object(HPyContext *ctx, jobject hpyContext, jobject element, bool update_native_cache) {
@@ -220,7 +220,7 @@ _HPy_HIDDEN HPy ctx_Unicode_FromWideChar_jni(HPyContext *ctx, const wchar_t *u,
 }
 
 _HPy_HIDDEN HPy ctx_Global_Load_jni(HPyContext *ctx, HPyGlobal global) {
-    long bits = toBits(global);
+    uint64_t bits = toBits(global);
     if (bits && isBoxedHandle(bits)) {
         jobject hpyContext = graal_hpy_context_get_native_context(ctx)->jni_context;
         jobject element = get_object_for_hpy_global(hpyContext, bits);

graalpython/com.oracle.graal.python.jni/src/hpy_native_fast_paths.c

@@ -92,15 +92,15 @@ static int (*original_Is)(HPyContext *ctx, HPy a, HPy b);
 static HPy (*original_Type)(HPyContext *ctx, HPy obj);
 
 static int augment_Is(HPyContext *ctx, HPy a, HPy b) {
-    long bitsA = toBits(a);
-    long bitsB = toBits(b);
+    uint64_t bitsA = toBits(a);
+    uint64_t bitsB = toBits(b);
     if (bitsA == bitsB) {
         return 1;
     } else if (isBoxedHandle(bitsA) && isBoxedHandle(bitsB)) {
         // This code assumes that objects pointed by a handle <= SINGLETON_HANDLES_MAX
         // always get that same handle
-        long unboxedA = unboxHandle(bitsA);
-        long unboxedB = unboxHandle(bitsB);
+        uint64_t unboxedA = unboxHandle(bitsA);
+        uint64_t unboxedB = unboxHandle(bitsB);
         if (unboxedA <= SINGLETON_HANDLES_MAX) {
             return 0;
         } else if (unboxedB <= SINGLETON_HANDLES_MAX) {
@@ -318,7 +318,7 @@ void augment_Field_Store(HPyContext *ctx, HPy target_object, HPyField *target_fi
 }
 
 HPy augment_Type(HPyContext *ctx, HPy obj) {
-    long bits = toBits(obj);
+    uint64_t bits = toBits(obj);
     if (isBoxedInt(bits)) {
         return augment_Dup(ctx, ctx->h_LongType);
     } else if (isBoxedDouble(bits))

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/CApiFunction.java

@@ -142,6 +142,7 @@
 import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.SIZE_T;
 import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.SIZE_T_PTR;
 import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.STAT_PTR;
+import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.PY_STAT_PTR;
 import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.TIMESPEC_PTR;
 import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.TIMEVAL_PTR;
 import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.TIME_T;
@@ -704,8 +705,8 @@ public final class CApiFunction {
     @CApiBuiltin(name = "_Py_FdIsInteractive", ret = Int, args = {FILE_PTR, PyObject}, call = NotImplemented)
     @CApiBuiltin(name = "_Py_fopen_obj", ret = FILE_PTR, args = {PyObject, ConstCharPtrAsTruffleString}, call = NotImplemented)
     @CApiBuiltin(name = "_Py_FreeCharPArray", ret = Void, args = {CHAR_CONST_ARRAY}, call = NotImplemented)
-    @CApiBuiltin(name = "_Py_fstat_noraise", ret = Int, args = {Int, STAT_PTR}, call = NotImplemented)
-    @CApiBuiltin(name = "_Py_fstat", ret = Int, args = {Int, STAT_PTR}, call = NotImplemented)
+    @CApiBuiltin(name = "_Py_fstat_noraise", ret = Int, args = {Int, PY_STAT_PTR}, call = NotImplemented)
+    @CApiBuiltin(name = "_Py_fstat", ret = Int, args = {Int, PY_STAT_PTR}, call = NotImplemented)
     @CApiBuiltin(name = "_Py_get_blocking", ret = Int, args = {Int}, call = NotImplemented)
     @CApiBuiltin(name = "_Py_get_inheritable", ret = Int, args = {Int}, call = NotImplemented)
     @CApiBuiltin(name = "_Py_GetAllocatedBlocks", ret = Py_ssize_t, args = {}, call = NotImplemented)

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/transitions/ArgDescriptor.java

@@ -257,6 +257,7 @@ public enum ArgDescriptor {
     SIZE_T(ArgBehavior.Int64, "size_t"),
     SIZE_T_PTR("size_t*"),
     STAT_PTR("struct stat*"),
+    PY_STAT_PTR("struct _Py_stat_struct*"),
     TIME_T("time_t"),
     TIME_T_PTR("time_t*"),
     TIMESPEC_PTR("struct timespec*"),

mx.graalpython/suite.py

@@ -653,7 +653,8 @@
                     "<others>": {
                         "cflags": [
                             "-DHPY_UNIVERSAL_ABI", "-DNDEBUG", "-DMS_WINDOWS",
-                            "/Z7", "/O2", "/W3", # cflags to replace -g -O3. -Werror would be /WX
+                            # cflags equivalent to -g -O3 -Wall (/WX would be -Werror)
+                            "-D_CRT_SECURE_NO_WARNINGS", "/Z7", "/O2", "/W3",
                             "-I\"<path:com.oracle.graal.python.cext>/include\"",
                             "-I\"<path:com.oracle.graal.python.cext>/include/internal\"",
                             "-I\"<path:com.oracle.graal.python.cext>/src\"",