Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(720)

Unified Diff: src/mark-compact.cc

Issue 12217108: Fix code flusher disabling while marking incrementally. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Added regression test. Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | test/cctest/test-heap.cc » ('j') | test/cctest/test-heap.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/mark-compact.cc
diff --git a/src/mark-compact.cc b/src/mark-compact.cc
index 869b318f547572257b66beb0df92c9e32b2ed814..6ce308176795b3967d9d26e5f84459fdb7b645bd 100644
--- a/src/mark-compact.cc
+++ b/src/mark-compact.cc
@@ -1104,17 +1104,14 @@ void CodeFlusher::EvictCandidate(JSFunction* function) {
void CodeFlusher::EvictJSFunctionCandidates() {
- Object* undefined = isolate_->heap()->undefined_value();
-
JSFunction* candidate = jsfunction_candidates_head_;
JSFunction* next_candidate;
while (candidate != NULL) {
next_candidate = GetNextCandidate(candidate);
- ClearNextCandidate(candidate, undefined);
+ EvictCandidate(candidate);
candidate = next_candidate;
}
-
- jsfunction_candidates_head_ = NULL;
+ ASSERT(jsfunction_candidates_head_ == NULL);
}
@@ -1123,11 +1120,10 @@ void CodeFlusher::EvictSharedFunctionInfoCandidates() {
SharedFunctionInfo* next_candidate;
while (candidate != NULL) {
next_candidate = GetNextCandidate(candidate);
- ClearNextCandidate(candidate);
+ EvictCandidate(candidate);
candidate = next_candidate;
}
-
- shared_function_info_candidates_head_ = NULL;
+ ASSERT(shared_function_info_candidates_head_ == NULL);
}
« no previous file with comments | « no previous file | test/cctest/test-heap.cc » ('j') | test/cctest/test-heap.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698