Skip to content

[mono] Fix types for arguments to printf calls #62796

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 15, 2021
Merged

[mono] Fix types for arguments to printf calls #62796

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8c27b07
[mono] Fix types for arguments to printf calls
akoeplinger Dec 14, 2021
1495e81
Fix build
akoeplinger Dec 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/mono/mono/component/debugger-state-machine.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ dump_thread_state (gpointer key, gpointer value, gpointer user_data)

mono_json_writer_indent (data->writer);
mono_json_writer_object_key(data->writer, "thread_id");
mono_json_writer_printf (data->writer, "\"0x%x\",\n", mono_debugger_tls_thread_id (debugger_tls));
mono_json_writer_printf (data->writer, "\"0x%x\",\n", (unsigned int) mono_debugger_tls_thread_id (debugger_tls));

mono_json_writer_indent (data->writer);
mono_json_writer_object_key (data->writer, "thread_state");
Expand Down Expand Up @@ -310,7 +310,7 @@ mono_debugger_state (JsonWriter *writer)

mono_json_writer_indent (writer);
mono_json_writer_object_key(writer, "il_offset");
mono_json_writer_printf (writer, "\"0x%x\",\n", bp->il_offset);
mono_json_writer_printf (writer, "\"0x%x\",\n", (unsigned int) bp->il_offset);

mono_json_writer_indent_pop (writer);
mono_json_writer_indent (writer);
Expand Down Expand Up @@ -351,15 +351,15 @@ mono_debugger_state (JsonWriter *writer)

mono_json_writer_indent (writer);
mono_json_writer_object_key(writer, "tid");
mono_json_writer_printf (writer, "\"0x%x\",\n", item.tid);
mono_json_writer_printf (writer, "\"0x%x\",\n", (unsigned int) item.tid);

mono_json_writer_indent (writer);
mono_json_writer_object_key(writer, "message");
mono_json_writer_printf (writer, "\"%s\",\n", item.message);

mono_json_writer_indent (writer);
mono_json_writer_object_key(writer, "counter");
mono_json_writer_printf (writer, "\"%d\"\n", header.counter);
mono_json_writer_printf (writer, "\"%ld\"\n", header.counter);

mono_json_writer_indent_pop (writer);
mono_json_writer_indent (writer);
Expand Down
2 changes: 1 addition & 1 deletion src/mono/mono/mini/interp/transform.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8713,7 +8713,7 @@ interp_cprop (TransformData *td)
sregs [0] = sregs [1];

if (td->verbose_level) {
g_print ("Replace ldloca/stfld pair (off %p) :\n\t", ldloca->il_offset);
g_print ("Replace ldloca/stfld pair (off %p) :\n\t", (void *)(uintptr_t) ldloca->il_offset);
dump_interp_inst (ins);
}
needs_retry = TRUE;
Expand Down
2 changes: 1 addition & 1 deletion src/mono/mono/mini/mini-runtime.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4972,7 +4972,7 @@ mono_runtime_print_stats (void)

g_print ("\nInitialized classes: %" G_GINT32_FORMAT "\n", mono_stats.generic_class_count);
g_print ("Inflated types: %" G_GINT32_FORMAT "\n", mono_stats.inflated_type_count);
g_print ("Generics virtual invokes: %ld\n", mono_jit_stats.generic_virtual_invocations);
g_print ("Generics virtual invokes: %" G_GINT32_FORMAT "\n", mono_jit_stats.generic_virtual_invocations);

g_print ("Sharable generic methods: %" G_GINT32_FORMAT "\n", mono_stats.generics_sharable_methods);
g_print ("Unsharable generic methods: %" G_GINT32_FORMAT "\n", mono_stats.generics_unsharable_methods);
Expand Down
2 changes: 1 addition & 1 deletion src/mono/mono/sgen/sgen-debug.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -986,7 +986,7 @@ check_reference_for_xdomain (GCObject **ptr, GCObject *obj, MonoDomain *domain)
mono_error_cleanup (error);
} else
str = NULL;
g_print ("xdomain reference in %p (%s.%s) at offset %d (%s) to %p (%s.%s) (%s) - pointed to by:\n",
g_print ("xdomain reference in %p (%s.%s) at offset %zu (%s) to %p (%s.%s) (%s) - pointed to by:\n",
obj, m_class_get_name_space (obj->vtable->klass), m_class_get_name (obj->vtable->klass),
offset, field ? field->name : "",
ref, m_class_get_name_space (ref->vtable->klass), m_class_get_name (ref->vtable->klass), str ? str : "");
Expand Down
2 changes: 1 addition & 1 deletion src/mono/mono/sgen/sgen-gc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3580,7 +3580,7 @@ sgen_gc_init (void)
if (*opt && mono_gc_parse_environment_string_extract_number (opt, &max_heap_candidate)) {
max_heap = (max_heap_candidate + page_size - 1) & ~(size_t)(page_size - 1);
if (max_heap != max_heap_candidate)
sgen_env_var_error (MONO_GC_PARAMS_NAME, "Rounding up.", "`max-heap-size` size must be a multiple of %d.", page_size);
sgen_env_var_error (MONO_GC_PARAMS_NAME, "Rounding up.", "`max-heap-size` size must be a multiple of %zu.", page_size);
} else {
sgen_env_var_error (MONO_GC_PARAMS_NAME, NULL, "`max-heap-size` must be an integer.");
}
Expand Down
4 changes: 2 additions & 2 deletions src/mono/mono/utils/mono-threads.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,9 +298,9 @@ dump_threads (void)
char thread_name [256] = { 0 };
pthread_getname_np (mono_thread_info_get_tid (info), thread_name, 255);

g_async_safe_printf ("--thread %p id %p [%p] (%s) state %x %s\n", info, (gpointer)(gsize) mono_thread_info_get_tid (info), (void*)(size_t)info->native_handle, thread_name, info->thread_state, info == cur ? "GC INITIATOR" : "" );
g_async_safe_printf ("--thread %p id %p [%p] (%s) state %x %s\n", info, (gpointer)(gsize) mono_thread_info_get_tid (info), (void*)(size_t)info->native_handle, thread_name, info->thread_state.raw, info == cur ? "GC INITIATOR" : "" );
#else
g_async_safe_printf ("--thread %p id %p [%p] state %x %s\n", info, (gpointer)(gsize) mono_thread_info_get_tid (info), (void*)(size_t)info->native_handle, info->thread_state, info == cur ? "GC INITIATOR" : "" );
g_async_safe_printf ("--thread %p id %p [%p] state %x %s\n", info, (gpointer)(gsize) mono_thread_info_get_tid (info), (void*)(size_t)info->native_handle, info->thread_state.raw, info == cur ? "GC INITIATOR" : "" );
#endif
} FOREACH_THREAD_SAFE_END
}
Expand Down