comparison src/share/vm/gc_implementation/parNew/parCardTableModRefBS.cpp @ 6275:957c266d8bc5

Merge with http://hg.openjdk.java.net/hsx/hsx24/hotspot/
author Doug Simon <doug.simon@oracle.com>
date Tue, 21 Aug 2012 10:39:19 +0200
parents 33df1aeaebbf d2a62e0f25eb
children e522a00b91aa
comparison
equal deleted inserted replaced
5891:fd8832ae511d 6275:957c266d8bc5
455 455
456 // Should we delete the old? 456 // Should we delete the old?
457 if (_lowest_non_clean[i] != NULL) { 457 if (_lowest_non_clean[i] != NULL) {
458 assert(n_chunks != _lowest_non_clean_chunk_size[i], 458 assert(n_chunks != _lowest_non_clean_chunk_size[i],
459 "logical consequence"); 459 "logical consequence");
460 FREE_C_HEAP_ARRAY(CardPtr, _lowest_non_clean[i]); 460 FREE_C_HEAP_ARRAY(CardPtr, _lowest_non_clean[i], mtGC);
461 _lowest_non_clean[i] = NULL; 461 _lowest_non_clean[i] = NULL;
462 } 462 }
463 // Now allocate a new one if necessary. 463 // Now allocate a new one if necessary.
464 if (_lowest_non_clean[i] == NULL) { 464 if (_lowest_non_clean[i] == NULL) {
465 _lowest_non_clean[i] = NEW_C_HEAP_ARRAY(CardPtr, n_chunks); 465 _lowest_non_clean[i] = NEW_C_HEAP_ARRAY(CardPtr, n_chunks, mtGC);
466 _lowest_non_clean_chunk_size[i] = n_chunks; 466 _lowest_non_clean_chunk_size[i] = n_chunks;
467 _lowest_non_clean_base_chunk_index[i] = addr_to_chunk_index(covered.start()); 467 _lowest_non_clean_base_chunk_index[i] = addr_to_chunk_index(covered.start());
468 for (int j = 0; j < (int)n_chunks; j++) 468 for (int j = 0; j < (int)n_chunks; j++)
469 _lowest_non_clean[i][j] = NULL; 469 _lowest_non_clean[i][j] = NULL;
470 } 470 }