projects
/
mono.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
a30d0c3
)
Merge pull request #5194 from xmcclure/orbis-freeswept
author
Andi McClure
<andi.mcclure@xamarin.com>
Mon, 17 Jul 2017 17:48:53 +0000
(13:48 -0400)
committer
GitHub
<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
patch
|
blob
|
history
diff --git
a/mono/sgen/sgen-marksweep.c
b/mono/sgen/sgen-marksweep.c
index 2d1bc5b279917b626d7615ea89d0c5ca305d7f7c..04feb680f2d77b9f6b239c0046cf4abf165cb589 100644
(file)
--- a/
mono/sgen/sgen-marksweep.c
+++ b/
mono/sgen/sgen-marksweep.c
@@
-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");
-#if
def 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.