Merge pull request #5194 from xmcclure/orbis-freeswept
authorAndi McClure <andi.mcclure@xamarin.com>
Mon, 17 Jul 2017 17:48:53 +0000 (13:48 -0400)
committerGitHub <noreply@github.com>
Mon, 17 Jul 2017 17:48:53 +0000 (13:48 -0400)
Do not major_free_swept_blocks on Orbis.

mono/sgen/sgen-marksweep.c

index 2d1bc5b279917b626d7615ea89d0c5ca305d7f7c..04feb680f2d77b9f6b239c0046cf4abf165cb589 100644 (file)
@@ -2137,7 +2137,7 @@ major_free_swept_blocks (size_t section_reserve)
 {
        SGEN_ASSERT (0, sweep_state == SWEEP_STATE_SWEPT, "Sweeping must have finished before freeing blocks");
 
-#ifdef TARGET_WIN32
+#if defined(HOST_WIN32) || defined(HOST_ORBIS)
                /*
                 * sgen_free_os_memory () asserts in mono_vfree () because windows doesn't like freeing the middle of
                 * a VirtualAlloc ()-ed block.