diff options
| author | Sedar Gokbulut <sedarg@microsoft.com> | 2015-03-30 17:44:46 -0700 |
|---|---|---|
| committer | Sedar Gokbulut <sedarg@microsoft.com> | 2015-03-30 17:44:46 -0700 |
| commit | 1f72421608e8477b7433f134dafb58850b362a98 (patch) | |
| tree | a487d8ad0240f0ea844acbd0e7b29305fe36349d /src/gc/gcpriv.h | |
| parent | 82440897d45e16d706e80dc96918d362339d0d95 (diff) | |
| download | coreclr-1f72421608e8477b7433f134dafb58850b362a98.tar.gz coreclr-1f72421608e8477b7433f134dafb58850b362a98.tar.bz2 coreclr-1f72421608e8477b7433f134dafb58850b362a98.zip | |
Port the following fixes to GC from netfxDev1:
1118110 [GC] Assert "chosen_power2 == 0", ndp\clr\src\vm\gc.cpp, Line: 8566 (Origin CS 1410546 - required for the next change)
1119047 ARM heap corruptions found in assert in gc_heap::plan_phase (Origin CS 1414858)
[tfs-changeset: 1442444]
Diffstat (limited to 'src/gc/gcpriv.h')
| -rw-r--r-- | src/gc/gcpriv.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/gc/gcpriv.h b/src/gc/gcpriv.h index 395b027957..f1fd1c7735 100644 --- a/src/gc/gcpriv.h +++ b/src/gc/gcpriv.h @@ -44,7 +44,10 @@ inline void FATAL_GC_ERROR() //relocation #endif //FEATURE_64BIT_ALIGNMENT +#ifndef RESPECT_LARGE_ALIGNMENT #define SHORT_PLUGS //used to keep ephemeral plugs short so they fit better into the oldest generation free items +#endif //!RESPECT_LARGE_ALIGNMENT + #ifdef SHORT_PLUGS #define DESIRED_PLUG_LENGTH (1000) #endif //SHORT_PLUGS |