Skip to content
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

Jump to bottom

[sgen] Disable freeing of OS memory on 64bit Windows build too #2369

Merged
merged 1 commit into from Dec 19, 2015
Merged

[sgen] Disable freeing of OS memory on 64bit Windows build too #2369

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 7 additions & 7 deletions mono/sgen/sgen-marksweep.c
View file
Open in desktop
Expand Up @@ -1846,13 +1846,6 @@ major_free_swept_blocks (size_t allowance)

SGEN_ASSERT (0, sweep_state == SWEEP_STATE_SWEPT, "Sweeping must have finished before freeing blocks");

#if SIZEOF_VOID_P != 8
{
int i, num_empty_blocks_orig, num_blocks, arr_length;
void *block;
void **empty_block_arr;
void **rebuild_next;

#ifdef TARGET_WIN32
/*
* sgen_free_os_memory () asserts in mono_vfree () because windows doesn't like freeing the middle of
Expand All @@ -1861,6 +1854,13 @@ major_free_swept_blocks (size_t allowance)
return;
#endif

#if SIZEOF_VOID_P != 8
{
int i, num_empty_blocks_orig, num_blocks, arr_length;
void *block;
void **empty_block_arr;
void **rebuild_next;

if (num_empty_blocks <= section_reserve)
return;
SGEN_ASSERT (0, num_empty_blocks > 0, "section reserve can't be negative");
Expand Down