Skip to content

Commit 76531f9

Browse files
committed
[MERGE #5285 @atulkatti] Fix RS4 merge issue. Re-enable allcoation during concurrent sweep feature.
Merge pull request #5285 from atulkatti:FixRS4MergeIssue.1
2 parents c372da9 + 789a2e5 commit 76531f9

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

lib/Common/CommonDefines.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,9 +186,9 @@
186186
#ifndef ENABLE_VALGRIND
187187
#define ENABLE_CONCURRENT_GC 1
188188
#ifdef _WIN32
189-
#define ENABLE_ALLOCATIONS_DURING_CONCURRENT_SWEEP 0 // Only takes effect when ENABLE_CONCURRENT_GC is enabled.
189+
#define ENABLE_ALLOCATIONS_DURING_CONCURRENT_SWEEP 1 // Only takes effect when ENABLE_CONCURRENT_GC is enabled.
190190
#else
191-
#define ENABLE_ALLOCATIONS_DURING_CONCURRENT_SWEEP_USE_SLIST 1 // Use Interlocked SLIST for allocableHeapBlockList
191+
#define ENABLE_ALLOCATIONS_DURING_CONCURRENT_SWEEP 0 // Needs ENABLE_CONCURRENT_GC to be enabled for this to be enabled.
192192
#endif
193193
#else
194194
#define ENABLE_CONCURRENT_GC 0

0 commit comments

Comments
 (0)