projects
/
platform
/
upstream
/
coreclr.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a7a79de
)
Fix incorrect merge in gc.cpp
author
Sergiy Kuryata
<sergeyk@microsoft.com>
Thu, 7 Jan 2016 20:57:53 +0000
(12:57 -0800)
committer
Sergiy Kuryata
<sergeyk@microsoft.com>
Thu, 7 Jan 2016 20:57:53 +0000
(12:57 -0800)
@Maoni0 noticed that there was one place in gc.cpp that was incorrectly
merged with code from other branches. This change fixes the problem.
src/gc/gc.cpp
patch
|
blob
|
history
diff --git
a/src/gc/gc.cpp
b/src/gc/gc.cpp
index
c91d2a6
..
b329f89
100644
(file)
--- 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
}
}
}