diff options
author | Alexander Köplinger <alex.koeplinger@outlook.com> | 2019-11-24 02:16:20 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-11-24 02:16:20 +0300 |
commit | 280e9d2423549d86686716f0818bcdbac9702ea1 (patch) | |
tree | da6fb86e1a696d0a86b4caed5a81bcab91d30c2d | |
parent | 165e28ae97cc3bcac2f36484c74e8cd7c39ee9f1 (diff) |
Fix warnings in runtime build (#17887)
This makes at least the netcore-mono build in dotnet/runtime warning-free.
-rw-r--r-- | mono/metadata/domain.c | 3 | ||||
-rw-r--r-- | mono/metadata/gc.c | 8 | ||||
-rw-r--r-- | mono/metadata/icall-def.h | 1 | ||||
-rw-r--r-- | mono/metadata/sgen-mono.c | 3 |
4 files changed, 2 insertions, 13 deletions
diff --git a/mono/metadata/domain.c b/mono/metadata/domain.c index 5552c3298b7..47056f67886 100644 --- a/mono/metadata/domain.c +++ b/mono/metadata/domain.c @@ -807,12 +807,11 @@ mono_init_internal (const char *filename, const char *exe_filename, const char * mono_defaults.generic_ienumerator_class = mono_class_load_from_name ( mono_defaults.corlib, "System.Collections.Generic", "IEnumerator`1"); - ERROR_DECL (error); - #ifndef ENABLE_NETCORE MonoClass *threadpool_wait_callback_class = mono_class_load_from_name ( mono_defaults.corlib, "System.Threading", "_ThreadPoolWaitCallback"); + ERROR_DECL (error); mono_defaults.threadpool_perform_wait_callback_method = mono_class_get_method_from_name_checked ( threadpool_wait_callback_class, "PerformWaitCallback", 0, 0, error); mono_error_assert_ok (error); diff --git a/mono/metadata/gc.c b/mono/metadata/gc.c index 726595d4d40..fe10c619aad 100644 --- a/mono/metadata/gc.c +++ b/mono/metadata/gc.c @@ -557,14 +557,6 @@ ves_icall_System_GC_GetTotalMemory (MonoBoolean forceCollection) } void -ves_icall_System_GC_KeepAlive (MonoObjectHandle obj, MonoError *error) -{ - /* - * Does nothing. - */ -} - -void ves_icall_System_GC_GetGCMemoryInfo (gint64* high_memory_load_threshold_bytes, gint64* memory_load_bytes, gint64* total_available_memory_bytes, diff --git a/mono/metadata/icall-def.h b/mono/metadata/icall-def.h index 851c79019ed..f0db8dce996 100644 --- a/mono/metadata/icall-def.h +++ b/mono/metadata/icall-def.h @@ -336,7 +336,6 @@ HANDLES(GC_0a, "GetGeneration", ves_icall_System_GC_GetGeneration, int, 1, (Mono NOHANDLES(ICALL(GC_0b, "GetMaxGeneration", ves_icall_System_GC_GetMaxGeneration)) NOHANDLES(ICALL(GC_1, "GetTotalMemory", ves_icall_System_GC_GetTotalMemory)) NOHANDLES(ICALL(GC_2, "InternalCollect", ves_icall_System_GC_InternalCollect)) -HANDLES(GC_3, "KeepAlive", ves_icall_System_GC_KeepAlive, void, 1, (MonoObject)) NOHANDLES(ICALL(GC_4a, "RecordPressure", ves_icall_System_GC_RecordPressure)) NOHANDLES(ICALL(GC_6, "WaitForPendingFinalizers", ves_icall_System_GC_WaitForPendingFinalizers)) HANDLES(GC_6b, "_ReRegisterForFinalize", ves_icall_System_GC_ReRegisterForFinalize, void, 1, (MonoObject)) diff --git a/mono/metadata/sgen-mono.c b/mono/metadata/sgen-mono.c index dd2d2ef7c7c..d350a86231b 100644 --- a/mono/metadata/sgen-mono.c +++ b/mono/metadata/sgen-mono.c @@ -848,7 +848,6 @@ sgen_finish_concurrent_work (const char *reason, gboolean stw) void mono_gc_clear_domain (MonoDomain * domain) { - LOSObject *bigobj, *prev; int i; LOCK_GC; @@ -2302,7 +2301,7 @@ sgen_client_scan_thread_data (void *start_nursery, void *end_nursery, gboolean p SGEN_LOG (3, "Skipping dead thread %p, range: %p-%p, size: %zd", info, info->client_info.stack_start, info->client_info.info.stack_end, (char*)info->client_info.info.stack_end - (char*)info->client_info.stack_start); skip_reason = 1; } else if (!mono_thread_info_is_live (info)) { - SGEN_LOG (3, "Skipping non-running thread %p, range: %p-%p, size: %zd (state %x)", info, info->client_info.stack_start, info->client_info.info.stack_end, (char*)info->client_info.info.stack_end - (char*)info->client_info.stack_start, info->client_info.info.thread_state); + SGEN_LOG (3, "Skipping non-running thread %p, range: %p-%p, size: %zd (state %x)", info, info->client_info.stack_start, info->client_info.info.stack_end, (char*)info->client_info.info.stack_end - (char*)info->client_info.stack_start, info->client_info.info.thread_state.raw); skip_reason = 3; } else if (!info->client_info.stack_start) { SGEN_LOG (3, "Skipping starting or detaching thread %p", info); |