From: Sergiy Kuryata <sergeyk@microsoft.com>
Date: Thu, 7 Jan 2016 20:57:53 +0000 (-0800)
Subject: Fix incorrect merge in gc.cpp
X-Git-Tag: accepted/tizen/base/20180629.140029~5918^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bfe57c6f88442b4c4b4bc0754443ce61035d24c8;p=platform%2Fupstream%2Fcoreclr.git

Fix incorrect merge in gc.cpp

@Maoni0 noticed that there was one place in gc.cpp that was incorrectly
merged with code from other branches. This change fixes the problem.
---

diff --git a/src/gc/gc.cpp b/src/gc/gc.cpp
index c91d2a6..b329f89 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
                     }
                 }
             }