Merge pull request #22005 from JuliaLang/yyc/pedantic

yuyichao · web-flow · commit f760dad82eb7 · 2017-05-21T22:40:56.000-04:00
Fix all pedantic warnings in C
diff --git a/src/dlload.c b/src/dlload.c
@@ -134,13 +134,13 @@ static void *jl_load_dynamic_library_(const char *modname, unsigned flags, int t
     if (modname == NULL) {
 #ifdef _OS_WINDOWS_
         if (!GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS | GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT,
-                                (LPCWSTR)(&jl_load_dynamic_library),
+                                (LPCWSTR)(uintptr_t)(&jl_load_dynamic_library),
                                 (HMODULE*)&handle)) {
             jl_error("could not load base module");
         }
 #else
         Dl_info info;
-        if (!dladdr(&jl_load_dynamic_library, &info) || !info.dli_fname)
+        if (!dladdr((void*)(uintptr_t)&jl_load_dynamic_library, &info) || !info.dli_fname)
             jl_error("could not load base module");
         handle = dlopen(info.dli_fname, RTLD_NOW);
 #endif
diff --git a/src/dump.c b/src/dump.c
@@ -240,7 +240,7 @@ static void jl_load_sysimg_so(void)
         size_t tls_getter_idx = *(size_t*)jl_dlsym(jl_sysimg_handle,
                                                    "jl_ptls_states_getter_idx");
         *sysimg_gvars[tls_getter_idx - 1] =
-            (jl_value_t*)jl_get_ptls_states_getter();
+            (jl_value_t*)(uintptr_t)jl_get_ptls_states_getter();
         size_t tls_offset_idx = *(size_t*)jl_dlsym(jl_sysimg_handle,
                                                    "jl_tls_offset_idx");
         *sysimg_gvars[tls_offset_idx - 1] =
@@ -445,12 +445,12 @@ static void jl_update_all_fptrs(void)
         assert(li->def && li->jlcall_api && li->jlcall_api != 2);
         int32_t cfunc = delayed_fptrs[i].cfunc - 1;
         if (cfunc >= 0) {
-            jl_fptr_to_llvm((jl_fptr_t)fvars[cfunc], li, 1);
+            jl_fptr_to_llvm((jl_fptr_t)(uintptr_t)fvars[cfunc], li, 1);
             linfos[cfunc] = li;
         }
         int32_t func = delayed_fptrs[i].func - 1;
         if (func >= 0) {
-            jl_fptr_to_llvm((jl_fptr_t)fvars[func], li, 0);
+            jl_fptr_to_llvm((jl_fptr_t)(uintptr_t)fvars[func], li, 0);
             linfos[func] = li;
         }
     }
@@ -2141,7 +2141,7 @@ static jl_value_t *jl_deserialize_value_(jl_serializer_state *s, jl_value_t *vta
     }
 }
 
-typedef struct _linkedlist_t {
+JL_EXTENSION typedef struct _linkedlist_t {
     struct _linkedlist_t *next;
     union {
         struct {
@@ -3429,7 +3429,7 @@ void jl_init_serializer(void)
 
     i=2;
     while (id_to_fptrs[i] != NULL) {
-        ptrhash_put(&fptr_to_id, (void*)id_to_fptrs[i], (void*)i);
+        ptrhash_put(&fptr_to_id, (void*)(uintptr_t)id_to_fptrs[i], (void*)i);
         i += 1;
     }
 
diff --git a/src/flisp/cvalues.c b/src/flisp/cvalues.c
@@ -780,7 +780,7 @@ value_t cbuiltin(fl_context_t *fl_ctx, const char *name, builtin_t f)
     cv->type = fl_ctx->builtintype;
     cv->data = &cv->_space[0];
     cv->len = sizeof(value_t);
-    *(void**)cv->data = (void*)f;
+    *(void**)cv->data = (void*)(uintptr_t)f;
 
     value_t sym = symbol(fl_ctx, name);
     ((symbol_t*)ptr(sym))->dlcache = cv;
diff --git a/src/flisp/flisp.c b/src/flisp/flisp.c
@@ -1020,7 +1020,7 @@ static uint32_t process_keys(fl_context_t *fl_ctx, value_t kwtable,
   - allocate vararg array
   - push closed env, set up new environment
 */
-static value_t apply_cl(fl_context_t *fl_ctx, uint32_t nargs)
+JL_EXTENSION static value_t apply_cl(fl_context_t *fl_ctx, uint32_t nargs)
 {
     VM_LABELS;
     VM_APPLY_LABELS;
@@ -1173,7 +1173,7 @@ static value_t apply_cl(fl_context_t *fl_ctx, uint32_t nargs)
             }
             else if (iscbuiltin(fl_ctx, fl_apply_func)) {
                 s = fl_ctx->SP;
-                fl_apply_v = ((builtin_t)(((void**)ptr(fl_apply_func))[3]))(fl_ctx, &fl_ctx->Stack[fl_ctx->SP-n], n);
+                fl_apply_v = ((builtin_t)(uintptr_t)(((void**)ptr(fl_apply_func))[3]))(fl_ctx, &fl_ctx->Stack[fl_ctx->SP-n], n);
                 fl_ctx->SP = s-n;
                 fl_ctx->Stack[fl_ctx->SP-1] = fl_apply_v;
                 NEXT_OP;
@@ -1223,7 +1223,7 @@ static value_t apply_cl(fl_context_t *fl_ctx, uint32_t nargs)
             }
             else if (iscbuiltin(fl_ctx, fl_apply_func)) {
                 s = fl_ctx->SP;
-                fl_apply_v = ((builtin_t)(((void**)ptr(fl_apply_func))[3]))(fl_ctx, &fl_ctx->Stack[fl_ctx->SP-n], n);
+                fl_apply_v = ((builtin_t)(uintptr_t)(((void**)ptr(fl_apply_func))[3]))(fl_ctx, &fl_ctx->Stack[fl_ctx->SP-n], n);
                 fl_ctx->SP = s-n;
                 fl_ctx->Stack[fl_ctx->SP-1] = fl_apply_v;
                 NEXT_OP;
diff --git a/src/flisp/flisp.h b/src/flisp/flisp.h
@@ -248,7 +248,7 @@ typedef struct _fltype_t {
     cvinitfunc_t init;
 } fltype_t;
 
-typedef struct {
+JL_EXTENSION typedef struct {
     fltype_t *type;
     void *data;
     size_t len;            // length of *data in bytes
diff --git a/src/flisp/print.c b/src/flisp/print.c
@@ -642,18 +642,18 @@ static void cvalue_printdata(fl_context_t *fl_ctx, ios_t *f, void *data,
             if (init == 0) {
 #if defined(RTLD_SELF)
                 jl_static_print = (size_t (*)(ios_t*, void*))
-                    dlsym(RTLD_SELF, "jl_static_show");
+                    (uintptr_t)dlsym(RTLD_SELF, "jl_static_show");
 #elif defined(RTLD_DEFAULT)
                 jl_static_print = (size_t (*)(ios_t*, void*))
-                    dlsym(RTLD_DEFAULT, "jl_static_show");
+                    (uintptr_t)dlsym(RTLD_DEFAULT, "jl_static_show");
 #elif defined(_OS_WINDOWS_)
                 HMODULE handle;
                 if (GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS |
                                        GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT,
                                        (LPCWSTR)(&cvalue_printdata),
                                        &handle)) {
                     jl_static_print = (size_t (*)(ios_t*, void*))
-                        GetProcAddress(handle, "jl_static_show");
+                        (uintptr_t)GetProcAddress(handle, "jl_static_show");
                 }
 #endif
                 init = 1;
@@ -748,8 +748,7 @@ static void cvalue_print(fl_context_t *fl_ctx, ios_t *f, value_t v)
         void *fptr = *(void**)data;
         label = (value_t)ptrhash_get(&fl_ctx->reverse_dlsym_lookup_table, cv);
         if (label == (value_t)HT_NOTFOUND) {
-            fl_ctx->HPOS += ios_printf(f, "#<builtin @0x%08zx>",
-                                  (size_t)(builtin_t)fptr);
+            fl_ctx->HPOS += ios_printf(f, "#<builtin @0x%08zx>", (size_t)fptr);
         }
         else {
             if (fl_ctx->print_princ) {
diff --git a/src/gc-debug.c b/src/gc-debug.c
@@ -1261,7 +1261,7 @@ NOINLINE void gc_mark_loop_unwind(jl_ptls_t ptls, gc_mark_sp_t sp, int pc_offset
                 break;
             }
             jl_safe_printf("%p: Root object: %p :: %p (bits: %d)\n        of type ",
-                           data, data->obj, (void*)data->tag, (int)data->bits);
+                           (void*)data, (void*)data->obj, (void*)data->tag, (int)data->bits);
             jl_((void*)data->tag);
             isroot = 1;
         }
@@ -1272,7 +1272,7 @@ NOINLINE void gc_mark_loop_unwind(jl_ptls_t ptls, gc_mark_sp_t sp, int pc_offset
                 break;
             }
             jl_safe_printf("%p: Queued root: %p :: %p (bits: %d)\n        of type ",
-                           data, data->obj, (void*)data->tag, (int)data->bits);
+                           (void*)data, (void*)data->obj, (void*)data->tag, (int)data->bits);
             jl_((void*)data->tag);
             isroot = 1;
         }
@@ -1282,7 +1282,8 @@ NOINLINE void gc_mark_loop_unwind(jl_ptls_t ptls, gc_mark_sp_t sp, int pc_offset
                 jl_safe_printf("Mark stack unwind overflow -- ABORTING !!!\n");
                 break;
             }
-            jl_safe_printf("%p: Finalizer list from %p to %p\n", data, data->begin, data->end);
+            jl_safe_printf("%p: Finalizer list from %p to %p\n",
+                           (void*)data, (void*)data->begin, (void*)data->end);
             isroot = 1;
         }
         else if (pc == gc_mark_label_addrs[GC_MARK_L_objarray]) {
@@ -1292,8 +1293,8 @@ NOINLINE void gc_mark_loop_unwind(jl_ptls_t ptls, gc_mark_sp_t sp, int pc_offset
                 break;
             }
             jl_safe_printf("%p:  %s Array in object %p :: %p -- [%p, %p)\n        of type ",
-                           data, prefix, data->parent, ((void**)data->parent)[-1],
-                           data->begin, data->end);
+                           (void*)data, prefix, (void*)data->parent, ((void**)data->parent)[-1],
+                           (void*)data->begin, (void*)data->end);
             jl_(jl_typeof(data->parent));
         }
         else if (pc == gc_mark_label_addrs[GC_MARK_L_obj8]) {
@@ -1305,7 +1306,7 @@ NOINLINE void gc_mark_loop_unwind(jl_ptls_t ptls, gc_mark_sp_t sp, int pc_offset
             jl_datatype_t *vt = (jl_datatype_t*)jl_typeof(data->parent);
             jl_fielddesc8_t *desc = (jl_fielddesc8_t*)jl_dt_layout_fields(vt->layout);
             jl_safe_printf("%p:  %s Object (8bit) %p :: %p -- [%d, %d)\n        of type ",
-                           data, prefix, data->parent, ((void**)data->parent)[-1],
+                           (void*)data, prefix, (void*)data->parent, ((void**)data->parent)[-1],
                            (int)(data->begin - desc), (int)(data->end - desc));
             jl_(jl_typeof(data->parent));
         }
@@ -1318,7 +1319,7 @@ NOINLINE void gc_mark_loop_unwind(jl_ptls_t ptls, gc_mark_sp_t sp, int pc_offset
             jl_datatype_t *vt = (jl_datatype_t*)jl_typeof(data->parent);
             jl_fielddesc16_t *desc = (jl_fielddesc16_t*)jl_dt_layout_fields(vt->layout);
             jl_safe_printf("%p:  %s Object (16bit) %p :: %p -- [%d, %d)\n        of type ",
-                           data, prefix, data->parent, ((void**)data->parent)[-1],
+                           (void*)data, prefix, (void*)data->parent, ((void**)data->parent)[-1],
                            (int)(data->begin - desc), (int)(data->end - desc));
             jl_(jl_typeof(data->parent));
         }
@@ -1331,7 +1332,7 @@ NOINLINE void gc_mark_loop_unwind(jl_ptls_t ptls, gc_mark_sp_t sp, int pc_offset
             jl_datatype_t *vt = (jl_datatype_t*)jl_typeof(data->parent);
             jl_fielddesc32_t *desc = (jl_fielddesc32_t*)jl_dt_layout_fields(vt->layout);
             jl_safe_printf("%p:  %s Object (32bit) %p :: %p -- [%d, %d)\n        of type ",
-                           data, prefix, data->parent, ((void**)data->parent)[-1],
+                           (void*)data, prefix, (void*)data->parent, ((void**)data->parent)[-1],
                            (int)(data->begin - desc), (int)(data->end - desc));
             jl_(jl_typeof(data->parent));
         }
@@ -1342,7 +1343,8 @@ NOINLINE void gc_mark_loop_unwind(jl_ptls_t ptls, gc_mark_sp_t sp, int pc_offset
                 break;
             }
             jl_safe_printf("%p:  %s Stack frame %p -- %d of %d (%s)\n",
-                           data, prefix, data->s, (int)data->i, (int)data->nroots >> 1,
+                           (void*)data, prefix, (void*)data->s, (int)data->i,
+                           (int)data->nroots >> 1,
                            (data->nroots & 1) ? "indirect" : "direct");
         }
         else if (pc == gc_mark_label_addrs[GC_MARK_L_module_binding]) {
@@ -1353,7 +1355,8 @@ NOINLINE void gc_mark_loop_unwind(jl_ptls_t ptls, gc_mark_sp_t sp, int pc_offset
                 break;
             }
             jl_safe_printf("%p:  %s Module (bindings) %p (bits %d) -- [%p, %p)\n",
-                           data, prefix, data->parent, (int)data->bits, data->begin, data->end);
+                           (void*)data, prefix, (void*)data->parent, (int)data->bits,
+                           (void*)data->begin, (void*)data->end);
         }
         else {
             jl_safe_printf("Unknown pc %p --- ABORTING !!!\n", pc);
diff --git a/src/gc.c b/src/gc.c
@@ -140,7 +140,7 @@ static void finalize_object(arraylist_t *list, jl_value_t *o,
             void *f = items[i + 1];
             move = 1;
             if (gc_ptr_tag(v, 1)) {
-                ((void (*)(void*))f)(o);
+                ((void (*)(void*))(uintptr_t)f)(o);
             }
             else {
                 arraylist_push(copied_list, o);
@@ -260,7 +260,7 @@ static void schedule_all_finalizers(arraylist_t *flist)
             schedule_finalization(v, f);
         }
         else {
-            ((void (*)(void*))f)(gc_ptr_clear_tag(v, 1));
+            ((void (*)(void*))(uintptr_t)f)(gc_ptr_clear_tag(v, 1));
         }
     }
     flist->len = 0;
@@ -1683,7 +1683,7 @@ STATIC_INLINE int gc_mark_scan_obj32(jl_ptls_t ptls, gc_mark_sp_t *sp, gc_mark_o
 // Additional optimizations are done for some of the common cases by skipping
 // the unnecessary data stack pointer increment and the load from the stack
 // (i.e. store to load forwaring). See `objary_loaded`, `obj8_loaded` and `obj16_loaded`.
-NOINLINE void gc_mark_loop(jl_ptls_t ptls, gc_mark_sp_t sp)
+JL_EXTENSION NOINLINE void gc_mark_loop(jl_ptls_t ptls, gc_mark_sp_t sp)
 {
     if (__unlikely(ptls == NULL)) {
         gc_mark_label_addrs[GC_MARK_L_marked_obj] = gc_mark_laddr(marked_obj);
@@ -2234,7 +2234,7 @@ static void sweep_finalizer_list(arraylist_t *list)
         if (isfreed) {
             // schedule finalizer or execute right away if it is not julia code
             if (is_cptr) {
-                ((void (*)(void*))fin)(jl_data_ptr(v));
+                ((void (*)(void*))(uintptr_t)fin)(jl_data_ptr(v));
                 continue;
             }
             schedule_finalization(v, fin);
diff --git a/src/gc.h b/src/gc.h
@@ -211,7 +211,7 @@ typedef union {
 
 // layout for big (>2k) objects
 
-typedef struct _bigval_t {
+JL_EXTENSION typedef struct _bigval_t {
     struct _bigval_t *next;
     struct _bigval_t **prev; // pointer to the next field of the prev entry
     union {
diff --git a/src/jl_uv.c b/src/jl_uv.c
@@ -405,13 +405,13 @@ JL_DLLEXPORT int jl_fs_close(int handle)
 }
 
 JL_DLLEXPORT int jl_uv_write(uv_stream_t *stream, const char *data, size_t n,
-                             uv_write_t *uvw, void *writecb)
+                             uv_write_t *uvw, uv_write_cb writecb)
 {
     uv_buf_t buf[1];
     buf[0].base = (char*)data;
     buf[0].len = n;
     JL_SIGATOMIC_BEGIN();
-    int err = uv_write(uvw,stream,buf,1,(uv_write_cb)writecb);
+    int err = uv_write(uvw, stream, buf, 1, writecb);
     JL_SIGATOMIC_END();
     return err;
 }
@@ -941,15 +941,15 @@ void jl_work_notifier(uv_work_t *req, int status)
     free(baton);
 }
 
-JL_DLLEXPORT int jl_queue_work(void *work_func, void *work_args, void *work_retval,
-                               void *notify_func, int notify_idx)
+JL_DLLEXPORT int jl_queue_work(work_cb_t work_func, void *work_args, void *work_retval,
+                               notify_cb_t notify_func, int notify_idx)
 {
     struct work_baton *baton = (struct work_baton*) malloc(sizeof(struct work_baton));
     baton->req.data = (void*) baton;
-    baton->work_func = (work_cb_t)work_func;
+    baton->work_func = work_func;
     baton->work_args = work_args;
     baton->work_retval = work_retval;
-    baton->notify_func = (notify_cb_t)notify_func;
+    baton->notify_func = notify_func;
     baton->notify_idx = notify_idx;
 
     uv_queue_work(jl_io_loop, &baton->req, jl_work_wrapper, jl_work_notifier);
diff --git a/src/jltypes.c b/src/jltypes.c
@@ -826,7 +826,7 @@ JL_DLLEXPORT jl_value_t *jl_tupletype_fill(size_t n, jl_value_t *v)
     return p;
 }
 
-typedef struct _jl_typestack_t {
+JL_EXTENSION typedef struct _jl_typestack_t {
     union {
         jl_value_t *ua;
         jl_datatype_t *tt;
diff --git a/src/julia.h b/src/julia.h
@@ -74,7 +74,7 @@ struct _jl_taggedvalue_bits {
     uintptr_t gc:2;
 };
 
-struct _jl_taggedvalue_t {
+JL_EXTENSION struct _jl_taggedvalue_t {
     union {
         uintptr_t header;
         jl_taggedvalue_t *next;
@@ -140,7 +140,7 @@ typedef struct {
     uint16_t isaligned:1; // data allocated with memalign
 } jl_array_flags_t;
 
-typedef struct {
+JL_EXTENSION typedef struct {
     JL_DATA_TYPE
     void *data;
 #ifdef STORE_ARRAY_LEN
@@ -190,7 +190,7 @@ typedef jl_value_t *(*jl_fptr_t)(jl_value_t*, jl_value_t**, uint32_t);
 typedef jl_value_t *(*jl_fptr_sparam_t)(jl_svec_t*, jl_value_t*, jl_value_t**, uint32_t);
 typedef jl_value_t *(*jl_fptr_linfo_t)(struct _jl_method_instance_t*, jl_value_t**, uint32_t, jl_svec_t*);
 
-typedef struct {
+JL_EXTENSION typedef struct {
     union {
         jl_fptr_t fptr;
         jl_fptr_t fptr1;
diff --git a/src/rtutils.c b/src/rtutils.c
@@ -504,10 +504,10 @@ static size_t jl_static_show_x_(JL_STREAM *out, jl_value_t *v, jl_datatype_t *vt
 {
     size_t n = 0;
     if ((uintptr_t)vt < 4096U) {
-        n += jl_printf(out, "<?#%p::%p>", v, vt);
+        n += jl_printf(out, "<?#%p::%p>", (void*)v, (void*)vt);
     }
     else if ((uintptr_t)v < 4096U) {
-        n += jl_printf(out, "<?#%p::", v);
+        n += jl_printf(out, "<?#%p::", (void*)v);
         n += jl_static_show_x(out, (jl_value_t*)vt, depth);
         n += jl_printf(out, ">");
     }
@@ -876,7 +876,7 @@ static size_t jl_static_show_x_(JL_STREAM *out, jl_value_t *v, jl_datatype_t *vt
         n += jl_printf(out, ")");
     }
     else {
-        n += jl_printf(out, "<?#%p::", v);
+        n += jl_printf(out, "<?#%p::", (void*)v);
         n += jl_static_show_x(out, (jl_value_t*)vt, depth);
         n += jl_printf(out, ">");
     }
diff --git a/src/support/dtypes.h b/src/support/dtypes.h
@@ -166,9 +166,11 @@ STATIC_INLINE unsigned int next_power_of_two(unsigned int val)
 #ifdef __GNUC__
 #define __unlikely(x) __builtin_expect(!!(x), 0)
 #define __likely(x)   __builtin_expect(!!(x), 1)
+#define JL_EXTENSION __extension__
 #else
 #define __unlikely(x) (x)
 #define __likely(x)   (x)
+#define JL_EXTENSION
 #endif
 
 #define DBL_MAXINT 9007199254740992LL
diff --git a/src/support/htable.inc b/src/support/htable.inc
@@ -189,7 +189,7 @@ int HTNAME##_remove(htable_t *h, void *key)                             \
                                                                         \
 void HTNAME##_adjoin(htable_t *h, void *key, void *val)                 \
 {                                                                       \
-    return HTNAME##_adjoin_r(h, key, val, NULL);                        \
+    HTNAME##_adjoin_r(h, key, val, NULL);                               \
 }
 
 #define HTIMPL_R(HTNAME, HFUNC, EQFUNC) _HTIMPL_EX(HTNAME, HFUNC, EQFUNC, )
diff --git a/src/support/utf8.c b/src/support/utf8.c
diff --git a/src/typemap.c b/src/typemap.c

Original file line number	Diff line number	Diff line change
`@@ -1261,7 +1261,7 @@ NOINLINE void gc_mark_loop_unwind(jl_ptls_t ptls, gc_mark_sp_t sp, int pc_offset`
`1261`	`1261`	`break;`
`1262`	`1262`	`}`
`1263`	`1263`	`jl_safe_printf("%p: Root object: %p :: %p (bits: %d)\n of type ",`
`1264`		`- data, data->obj, (void*)data->tag, (int)data->bits);`
	`1264`	`+ (void)data, (void)data->obj, (void*)data->tag, (int)data->bits);`
`1265`	`1265`	`jl_((void*)data->tag);`
`1266`	`1266`	`isroot = 1;`
`1267`	`1267`	`}`
`@@ -1272,7 +1272,7 @@ NOINLINE void gc_mark_loop_unwind(jl_ptls_t ptls, gc_mark_sp_t sp, int pc_offset`
`1272`	`1272`	`break;`
`1273`	`1273`	`}`
`1274`	`1274`	`jl_safe_printf("%p: Queued root: %p :: %p (bits: %d)\n of type ",`
`1275`		`- data, data->obj, (void*)data->tag, (int)data->bits);`
	`1275`	`+ (void)data, (void)data->obj, (void*)data->tag, (int)data->bits);`
`1276`	`1276`	`jl_((void*)data->tag);`
`1277`	`1277`	`isroot = 1;`
`1278`	`1278`	`}`
`@@ -1282,7 +1282,8 @@ NOINLINE void gc_mark_loop_unwind(jl_ptls_t ptls, gc_mark_sp_t sp, int pc_offset`
`1282`	`1282`	`jl_safe_printf("Mark stack unwind overflow -- ABORTING !!!\n");`
`1283`	`1283`	`break;`
`1284`	`1284`	`}`
`1285`		`- jl_safe_printf("%p: Finalizer list from %p to %p\n", data, data->begin, data->end);`
	`1285`	`+ jl_safe_printf("%p: Finalizer list from %p to %p\n",`
	`1286`	`+ (void)data, (void)data->begin, (void*)data->end);`
`1286`	`1287`	`isroot = 1;`
`1287`	`1288`	`}`
`1288`	`1289`	`else if (pc == gc_mark_label_addrs[GC_MARK_L_objarray]) {`
`@@ -1292,8 +1293,8 @@ NOINLINE void gc_mark_loop_unwind(jl_ptls_t ptls, gc_mark_sp_t sp, int pc_offset`
`1292`	`1293`	`break;`
`1293`	`1294`	`}`
`1294`	`1295`	`jl_safe_printf("%p: %s Array in object %p :: %p -- [%p, %p)\n of type ",`
`1295`		`- data, prefix, data->parent, ((void**)data->parent)[-1],`
`1296`		`- data->begin, data->end);`
	`1296`	`+ (void)data, prefix, (void)data->parent, ((void**)data->parent)[-1],`
	`1297`	`+ (void)data->begin, (void)data->end);`
`1297`	`1298`	`jl_(jl_typeof(data->parent));`
`1298`	`1299`	`}`
`1299`	`1300`	`else if (pc == gc_mark_label_addrs[GC_MARK_L_obj8]) {`
`@@ -1305,7 +1306,7 @@ NOINLINE void gc_mark_loop_unwind(jl_ptls_t ptls, gc_mark_sp_t sp, int pc_offset`
`1305`	`1306`	`jl_datatype_t vt = (jl_datatype_t)jl_typeof(data->parent);`
`1306`	`1307`	`jl_fielddesc8_t desc = (jl_fielddesc8_t)jl_dt_layout_fields(vt->layout);`
`1307`	`1308`	`jl_safe_printf("%p: %s Object (8bit) %p :: %p -- [%d, %d)\n of type ",`
`1308`		`- data, prefix, data->parent, ((void**)data->parent)[-1],`
	`1309`	`+ (void)data, prefix, (void)data->parent, ((void**)data->parent)[-1],`
`1309`	`1310`	`(int)(data->begin - desc), (int)(data->end - desc));`
`1310`	`1311`	`jl_(jl_typeof(data->parent));`
`1311`	`1312`	`}`
`@@ -1318,7 +1319,7 @@ NOINLINE void gc_mark_loop_unwind(jl_ptls_t ptls, gc_mark_sp_t sp, int pc_offset`
`1318`	`1319`	`jl_datatype_t vt = (jl_datatype_t)jl_typeof(data->parent);`
`1319`	`1320`	`jl_fielddesc16_t desc = (jl_fielddesc16_t)jl_dt_layout_fields(vt->layout);`
`1320`	`1321`	`jl_safe_printf("%p: %s Object (16bit) %p :: %p -- [%d, %d)\n of type ",`
`1321`		`- data, prefix, data->parent, ((void**)data->parent)[-1],`
	`1322`	`+ (void)data, prefix, (void)data->parent, ((void**)data->parent)[-1],`
`1322`	`1323`	`(int)(data->begin - desc), (int)(data->end - desc));`
`1323`	`1324`	`jl_(jl_typeof(data->parent));`
`1324`	`1325`	`}`
`@@ -1331,7 +1332,7 @@ NOINLINE void gc_mark_loop_unwind(jl_ptls_t ptls, gc_mark_sp_t sp, int pc_offset`
`1331`	`1332`	`jl_datatype_t vt = (jl_datatype_t)jl_typeof(data->parent);`
`1332`	`1333`	`jl_fielddesc32_t desc = (jl_fielddesc32_t)jl_dt_layout_fields(vt->layout);`
`1333`	`1334`	`jl_safe_printf("%p: %s Object (32bit) %p :: %p -- [%d, %d)\n of type ",`
`1334`		`- data, prefix, data->parent, ((void**)data->parent)[-1],`
	`1335`	`+ (void)data, prefix, (void)data->parent, ((void**)data->parent)[-1],`
`1335`	`1336`	`(int)(data->begin - desc), (int)(data->end - desc));`
`1336`	`1337`	`jl_(jl_typeof(data->parent));`
`1337`	`1338`	`}`
`@@ -1342,7 +1343,8 @@ NOINLINE void gc_mark_loop_unwind(jl_ptls_t ptls, gc_mark_sp_t sp, int pc_offset`
`1342`	`1343`	`break;`
`1343`	`1344`	`}`
`1344`	`1345`	`jl_safe_printf("%p: %s Stack frame %p -- %d of %d (%s)\n",`
`1345`		`- data, prefix, data->s, (int)data->i, (int)data->nroots >> 1,`
	`1346`	`+ (void)data, prefix, (void)data->s, (int)data->i,`
	`1347`	`+ (int)data->nroots >> 1,`
`1346`	`1348`	`(data->nroots & 1) ? "indirect" : "direct");`
`1347`	`1349`	`}`
`1348`	`1350`	`else if (pc == gc_mark_label_addrs[GC_MARK_L_module_binding]) {`
`@@ -1353,7 +1355,8 @@ NOINLINE void gc_mark_loop_unwind(jl_ptls_t ptls, gc_mark_sp_t sp, int pc_offset`
`1353`	`1355`	`break;`
`1354`	`1356`	`}`
`1355`	`1357`	`jl_safe_printf("%p: %s Module (bindings) %p (bits %d) -- [%p, %p)\n",`
`1356`		`- data, prefix, data->parent, (int)data->bits, data->begin, data->end);`
	`1358`	`+ (void)data, prefix, (void)data->parent, (int)data->bits,`
	`1359`	`+ (void)data->begin, (void)data->end);`
`1357`	`1360`	`}`
`1358`	`1361`	`else {`
`1359`	`1362`	`jl_safe_printf("Unknown pc %p --- ABORTING !!!\n", pc);`
Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,7 @@ static void finalize_object(arraylist_t list, jl_value_t o,`
`140`	`140`	`void *f = items[i + 1];`
`141`	`141`	`move = 1;`
`142`	`142`	`if (gc_ptr_tag(v, 1)) {`
`143`		`- ((void ()(void))f)(o);`
	`143`	`+ ((void ()(void))(uintptr_t)f)(o);`
`144`	`144`	`}`
`145`	`145`	`else {`
`146`	`146`	`arraylist_push(copied_list, o);`
`@@ -260,7 +260,7 @@ static void schedule_all_finalizers(arraylist_t *flist)`
`260`	`260`	`schedule_finalization(v, f);`
`261`	`261`	`}`
`262`	`262`	`else {`
`263`		`- ((void ()(void))f)(gc_ptr_clear_tag(v, 1));`
	`263`	`+ ((void ()(void))(uintptr_t)f)(gc_ptr_clear_tag(v, 1));`
`264`	`264`	`}`
`265`	`265`	`}`
`266`	`266`	`flist->len = 0;`
`@@ -1683,7 +1683,7 @@ STATIC_INLINE int gc_mark_scan_obj32(jl_ptls_t ptls, gc_mark_sp_t *sp, gc_mark_o`
`1683`	`1683`	`// Additional optimizations are done for some of the common cases by skipping`
`1684`	`1684`	`// the unnecessary data stack pointer increment and the load from the stack`
`1685`	`1685`	// (i.e. store to load forwaring). See `objary_loaded`, `obj8_loaded` and `obj16_loaded`.
`1686`		`-NOINLINE void gc_mark_loop(jl_ptls_t ptls, gc_mark_sp_t sp)`
	`1686`	`+JL_EXTENSION NOINLINE void gc_mark_loop(jl_ptls_t ptls, gc_mark_sp_t sp)`
`1687`	`1687`	`{`
`1688`	`1688`	`if (__unlikely(ptls == NULL)) {`
`1689`	`1689`	`gc_mark_label_addrs[GC_MARK_L_marked_obj] = gc_mark_laddr(marked_obj);`
`@@ -2234,7 +2234,7 @@ static void sweep_finalizer_list(arraylist_t *list)`
`2234`	`2234`	`if (isfreed) {`
`2235`	`2235`	`// schedule finalizer or execute right away if it is not julia code`
`2236`	`2236`	`if (is_cptr) {`
`2237`		`- ((void ()(void))fin)(jl_data_ptr(v));`
	`2237`	`+ ((void ()(void))(uintptr_t)fin)(jl_data_ptr(v));`
`2238`	`2238`	`continue;`
`2239`	`2239`	`}`
`2240`	`2240`	`schedule_finalization(v, fin);`
Original file line number	Diff line number	Diff line change
`@@ -826,7 +826,7 @@ JL_DLLEXPORT jl_value_t jl_tupletype_fill(size_t n, jl_value_t v)`
`826`	`826`	`return p;`
`827`	`827`	`}`
`828`	`828`
`829`		`-typedef struct _jl_typestack_t {`
	`829`	`+JL_EXTENSION typedef struct _jl_typestack_t {`
`830`	`830`	`union {`
`831`	`831`	`jl_value_t *ua;`
`832`	`832`	`jl_datatype_t *tt;`
Original file line number	Diff line number	Diff line change
`@@ -504,10 +504,10 @@ static size_t jl_static_show_x_(JL_STREAM out, jl_value_t v, jl_datatype_t *vt`
`504`	`504`	`{`
`505`	`505`	`size_t n = 0;`
`506`	`506`	`if ((uintptr_t)vt < 4096U) {`
`507`		`- n += jl_printf(out, "<?#%p::%p>", v, vt);`
	`507`	`+ n += jl_printf(out, "<?#%p::%p>", (void)v, (void)vt);`
`508`	`508`	`}`
`509`	`509`	`else if ((uintptr_t)v < 4096U) {`
`510`		`- n += jl_printf(out, "<?#%p::", v);`
	`510`	`+ n += jl_printf(out, "<?#%p::", (void*)v);`
`511`	`511`	`n += jl_static_show_x(out, (jl_value_t*)vt, depth);`
`512`	`512`	`n += jl_printf(out, ">");`
`513`	`513`	`}`
`@@ -876,7 +876,7 @@ static size_t jl_static_show_x_(JL_STREAM out, jl_value_t v, jl_datatype_t *vt`
`876`	`876`	`n += jl_printf(out, ")");`
`877`	`877`	`}`
`878`	`878`	`else {`
`879`		`- n += jl_printf(out, "<?#%p::", v);`
	`879`	`+ n += jl_printf(out, "<?#%p::", (void*)v);`
`880`	`880`	`n += jl_static_show_x(out, (jl_value_t*)vt, depth);`
`881`	`881`	`n += jl_printf(out, ">");`
`882`	`882`	`}`
Original file line number	Diff line number	Diff line change
`@@ -189,7 +189,7 @@ int HTNAME##_remove(htable_t h, void key) \`
`189`	`189`	`\`
`190`	`190`	`void HTNAME##_adjoin(htable_t h, void key, void *val) \`
`191`	`191`	`{ \`
`192`		`- return HTNAME##_adjoin_r(h, key, val, NULL); \`
	`192`	`+ HTNAME##_adjoin_r(h, key, val, NULL); \`
`193`	`193`	`}`
`194`	`194`
`195`	`195`	`#define HTIMPL_R(HTNAME, HFUNC, EQFUNC) _HTIMPL_EX(HTNAME, HFUNC, EQFUNC, )`