Index: src/compiler.cc |
diff --git a/src/compiler.cc b/src/compiler.cc |
index 7b0b92152931dc3da1e9036cc585b631de054c5c..b65c9af4f63f198a63186e7a5f0e194e6846a838 100644 |
--- a/src/compiler.cc |
+++ b/src/compiler.cc |
@@ -107,7 +107,7 @@ void CompilationInfo::Initialize(Isolate* isolate, Mode mode, Zone* zone) { |
no_frame_ranges_ = isolate->cpu_profiler()->is_profiling() |
? new List<OffsetRange>(2) : NULL; |
for (int i = 0; i < DependentCode::kGroupCount; i++) { |
- dependent_maps_[i] = NULL; |
+ dependencies_[i] = NULL; |
} |
if (mode == STUB) { |
mode_ = STUB; |
@@ -132,36 +132,42 @@ CompilationInfo::~CompilationInfo() { |
// Check that no dependent maps have been added or added dependent maps have |
// been rolled back or committed. |
for (int i = 0; i < DependentCode::kGroupCount; i++) { |
- ASSERT_EQ(NULL, dependent_maps_[i]); |
+ ASSERT_EQ(NULL, dependencies_[i]); |
} |
#endif // DEBUG |
} |
-void CompilationInfo::CommitDependentMaps(Handle<Code> code) { |
+void CompilationInfo::CommitDependencies(Handle<Code> code) { |
for (int i = 0; i < DependentCode::kGroupCount; i++) { |
- ZoneList<Handle<Map> >* group_maps = dependent_maps_[i]; |
- if (group_maps == NULL) continue; |
+ ZoneList<Handle<HeapObject> >* group_objects = dependencies_[i]; |
+ if (group_objects == NULL) continue; |
ASSERT(!object_wrapper_.is_null()); |
- for (int j = 0; j < group_maps->length(); j++) { |
- group_maps->at(j)->dependent_code()->UpdateToFinishedCode( |
- static_cast<DependentCode::DependencyGroup>(i), this, *code); |
+ for (int j = 0; j < group_objects->length(); j++) { |
+ DependentCode::DependencyGroup group = |
+ static_cast<DependentCode::DependencyGroup>(i); |
+ DependentCode* dependent_code = |
+ DependentCode::ForObject(group_objects->at(j), group); |
+ dependent_code->UpdateToFinishedCode(group, this, *code); |
} |
- dependent_maps_[i] = NULL; // Zone-allocated, no need to delete. |
+ dependencies_[i] = NULL; // Zone-allocated, no need to delete. |
} |
} |
-void CompilationInfo::RollbackDependentMaps() { |
+void CompilationInfo::RollbackDependencies() { |
// Unregister from all dependent maps if not yet committed. |
for (int i = 0; i < DependentCode::kGroupCount; i++) { |
- ZoneList<Handle<Map> >* group_maps = dependent_maps_[i]; |
- if (group_maps == NULL) continue; |
- for (int j = 0; j < group_maps->length(); j++) { |
- group_maps->at(j)->dependent_code()->RemoveCompilationInfo( |
- static_cast<DependentCode::DependencyGroup>(i), this); |
+ ZoneList<Handle<HeapObject> >* group_objects = dependencies_[i]; |
+ if (group_objects == NULL) continue; |
+ for (int j = 0; j < group_objects->length(); j++) { |
+ DependentCode::DependencyGroup group = |
+ static_cast<DependentCode::DependencyGroup>(i); |
+ DependentCode* dependent_code = |
+ DependentCode::ForObject(group_objects->at(j), group); |
+ dependent_code->RemoveCompilationInfo(group, this); |
} |
- dependent_maps_[i] = NULL; // Zone-allocated, no need to delete. |
+ dependencies_[i] = NULL; // Zone-allocated, no need to delete. |
} |
} |