Mercurial > hg > truffle
comparison src/share/vm/gc_implementation/g1/g1RemSetSummary.cpp @ 20804:7848fc12602b
Merge with jdk8u40-b25
author | Gilles Duboscq <gilles.m.duboscq@oracle.com> |
---|---|
date | Tue, 07 Apr 2015 14:58:49 +0200 |
parents | 7baf47cb97cb |
children |
comparison
equal
deleted
inserted
replaced
20184:84105dcdb05b | 20804:7848fc12602b |
---|---|
251 _max_rs_mem_sz_region = r; | 251 _max_rs_mem_sz_region = r; |
252 } | 252 } |
253 size_t occupied_cards = hrrs->occupied(); | 253 size_t occupied_cards = hrrs->occupied(); |
254 size_t code_root_mem_sz = hrrs->strong_code_roots_mem_size(); | 254 size_t code_root_mem_sz = hrrs->strong_code_roots_mem_size(); |
255 if (code_root_mem_sz > max_code_root_mem_sz()) { | 255 if (code_root_mem_sz > max_code_root_mem_sz()) { |
256 _max_code_root_mem_sz = code_root_mem_sz; | |
256 _max_code_root_mem_sz_region = r; | 257 _max_code_root_mem_sz_region = r; |
257 } | 258 } |
258 size_t code_root_elems = hrrs->strong_code_roots_list_length(); | 259 size_t code_root_elems = hrrs->strong_code_roots_list_length(); |
259 | 260 |
260 RegionTypeCounter* current = NULL; | 261 RegionTypeCounter* current = NULL; |
261 if (r->is_young()) { | 262 if (r->is_free()) { |
263 current = &_free; | |
264 } else if (r->is_young()) { | |
262 current = &_young; | 265 current = &_young; |
263 } else if (r->isHumongous()) { | 266 } else if (r->isHumongous()) { |
264 current = &_humonguous; | 267 current = &_humonguous; |
265 } else if (r->is_empty()) { | 268 } else if (r->is_old()) { |
266 current = &_free; | 269 current = &_old; |
267 } else { | 270 } else { |
268 current = &_old; | 271 ShouldNotReachHere(); |
269 } | 272 } |
270 current->add(rs_mem_sz, occupied_cards, code_root_mem_sz, code_root_elems); | 273 current->add(rs_mem_sz, occupied_cards, code_root_mem_sz, code_root_elems); |
271 _all.add(rs_mem_sz, occupied_cards, code_root_mem_sz, code_root_elems); | 274 _all.add(rs_mem_sz, occupied_cards, code_root_mem_sz, code_root_elems); |
272 | 275 |
273 return false; | 276 return false; |