diff options
author | Jan Kotas <jkotas@microsoft.com> | 2016-01-07 21:09:31 -0800 |
---|---|---|
committer | Jan Kotas <jkotas@microsoft.com> | 2016-01-07 21:09:31 -0800 |
commit | d86e600cae07387942c6185dfb77e77938368c28 (patch) | |
tree | e49737de1af0543a231a9c38c7006b1d07dc7029 | |
parent | 71ad0d56e5e59c53840b9137457bc8f962a568ac (diff) | |
parent | bfe57c6f88442b4c4b4bc0754443ce61035d24c8 (diff) | |
download | coreclr-d86e600cae07387942c6185dfb77e77938368c28.tar.gz coreclr-d86e600cae07387942c6185dfb77e77938368c28.tar.bz2 coreclr-d86e600cae07387942c6185dfb77e77938368c28.zip |
Merge pull request #2562 from sergiy-k/gccodefix
Fix incorrect merge in gc.cpp
-rw-r--r-- | src/gc/gc.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/gc/gc.cpp b/src/gc/gc.cpp index c91d2a6baf..b329f894ed 100644 --- a/src/gc/gc.cpp +++ b/src/gc/gc.cpp @@ -21674,6 +21674,14 @@ void gc_heap::plan_phase (int condemned_gen_number) (size_t)new_address + ps, ps, (is_plug_padded (plug_start) ? 1 : 0))); #endif //SIMPLE_DPRINTF + +#ifdef SHORT_PLUGS + if (is_plug_padded (plug_start)) + { + dprintf (3, ("%Ix was padded", plug_start)); + dd_padding_size (dd_active_old) += Align (min_obj_size); + } +#endif //SHORT_PLUGS } } } |