[runtime] Fixed Valgrind support to compile against Win64.

mono · Aug 17, 2015 · 1747c03 · 1747c03
1 parent 7c07d1d
commit 1747c03
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/mono/mini/mini-runtime.c b/mono/mini/mini-runtime.c
@@ -119,12 +119,14 @@ static void register_icalls (void);
 gboolean
 mono_running_on_valgrind (void)
 {
+#ifndef HOST_WIN32
 	if (RUNNING_ON_VALGRIND){
 #ifdef VALGRIND_JIT_REGISTER_MAP
 		valgrind_register = TRUE;
 #endif
 		return TRUE;
 	} else
+#endif
 		return FALSE;
 }
 

diff --git a/mono/mini/tramp-amd64.c b/mono/mini/tramp-amd64.c
@@ -148,6 +148,11 @@ mono_arch_get_llvm_imt_trampoline (MonoDomain *domain, MonoMethod *m, int vt_off
 	return start;
 }
 
+#ifdef _WIN64
+// Workaround lack of Valgrind support for 64-bit Windows
+#define VALGRIND_DISCARD_TRANSLATIONS(...)
+#endif
+
 /*
  * mono_arch_patch_callsite:
  *

diff --git a/mono/sgen/sgen-gc.c b/mono/sgen/sgen-gc.c
@@ -822,7 +822,7 @@ sgen_conservatively_pin_objects_from (void **start, void **end, void *start_nurs
 {
 	int count = 0;
 
-#ifdef VALGRIND_MAKE_MEM_DEFINED_IF_ADDRESSABLE
+#if defined(VALGRIND_MAKE_MEM_DEFINED_IF_ADDRESSABLE) && !defined(_WIN64)
 	VALGRIND_MAKE_MEM_DEFINED_IF_ADDRESSABLE (start, (char*)end - (char*)start);
 #endif
 

diff --git a/mono/utils/valgrind.h b/mono/utils/valgrind.h
@@ -451,7 +451,7 @@ typedef
 
 #if defined(PLAT_amd64_win64) && !defined(__GNUC__)
 
-#error Unsupported compiler.
+//#error Unsupported compiler.
 
 #endif /* PLAT_amd64_win64 */