Index: src/mark-compact.cc |
diff --git a/src/mark-compact.cc b/src/mark-compact.cc |
index 32516845dfdef73a30032fdf179127097a71ca52..ce9f7b4c9b3483d04e2d832d4dbbe9ee0aeaf2ed 100644 |
--- a/src/mark-compact.cc |
+++ b/src/mark-compact.cc |
@@ -2294,9 +2294,9 @@ void MarkCompactCollector::ClearNonLiveReferences() { |
ClearNonLiveMapTransitions(map, map_mark); |
if (map_mark.Get()) { |
- ClearNonLiveDependentCodes(map); |
+ ClearNonLiveDependentCode(map); |
} else { |
- ClearAndDeoptimizeDependentCodes(map); |
+ ClearAndDeoptimizeDependentCode(map); |
} |
} |
} |
@@ -2366,12 +2366,11 @@ void MarkCompactCollector::ClearNonLiveMapTransitions(Map* map, |
} |
-void MarkCompactCollector::ClearAndDeoptimizeDependentCodes(Map* map) { |
+void MarkCompactCollector::ClearAndDeoptimizeDependentCode(Map* map) { |
AssertNoAllocation no_allocation_scope; |
- DependentCodes* codes = map->dependent_codes(); |
- DependentCodes::GroupStartIndexes starts; |
- codes->ComputeGroupStartIndexes(starts); |
- int number_of_codes = starts[DependentCodes::kGroupCount]; |
+ DependentCode* codes = map->dependent_code(); |
+ DependentCode::GroupStartIndexes starts(codes); |
+ int number_of_codes = starts.at(DependentCode::kGroupCount); |
if (number_of_codes == 0) return; |
for (int i = 0; i < number_of_codes; i++) { |
Code* code = codes->code_at(i); |
@@ -2380,22 +2379,21 @@ void MarkCompactCollector::ClearAndDeoptimizeDependentCodes(Map* map) { |
} |
codes->clear_code_at(i); |
} |
- map->set_dependent_codes(DependentCodes::cast(heap()->empty_fixed_array())); |
+ map->set_dependent_code(DependentCode::cast(heap()->empty_fixed_array())); |
} |
-void MarkCompactCollector::ClearNonLiveDependentCodes(Map* map) { |
+void MarkCompactCollector::ClearNonLiveDependentCode(Map* map) { |
AssertNoAllocation no_allocation_scope; |
- DependentCodes* codes = map->dependent_codes(); |
- DependentCodes::GroupStartIndexes starts; |
- codes->ComputeGroupStartIndexes(starts); |
- int number_of_codes = starts[DependentCodes::kGroupCount]; |
+ DependentCode* codes = map->dependent_code(); |
+ DependentCode::GroupStartIndexes starts(codes); |
+ int number_of_codes = starts.at(DependentCode::kGroupCount); |
if (number_of_codes == 0) return; |
int new_number_of_codes = 0; |
// Go through all groups, remove dead codes and compact. |
- for (int g = 0; g < DependentCodes::kGroupCount; g++) { |
+ for (int g = 0; g < DependentCode::kGroupCount; g++) { |
int group_number_of_codes = 0; |
- for (int i = starts[g]; i < starts[g + 1]; i++) { |
+ for (int i = starts.at(g); i < starts.at(g + 1); i++) { |
Code* code = codes->code_at(i); |
if (IsMarked(code) && !code->marked_for_deoptimization()) { |
if (new_number_of_codes + group_number_of_codes != i) { |
@@ -2407,7 +2405,7 @@ void MarkCompactCollector::ClearNonLiveDependentCodes(Map* map) { |
group_number_of_codes++; |
} |
} |
- codes->set_number_of_codes(static_cast<DependentCodes::DependencyGroup>(g), |
+ codes->set_number_of_codes(static_cast<DependentCode::DependencyGroup>(g), |
group_number_of_codes); |
new_number_of_codes += group_number_of_codes; |
} |