Merged r13480, r13481 into trunk branch.

src/mark-compact.cc

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 925 matching lines @@
   SharedFunctionInfo* candidate = shared_function_info_candidates_head_;
   while (candidate != NULL) {
     if (candidate == shared_info) return true;
     candidate = GetNextCandidate(candidate);
   }
   return false;
 }
 
 
 void CodeFlusher::EvictCandidate(SharedFunctionInfo* shared_info) {
-  // The function is no longer a candidate, make sure it gets visited
-  // again so that previous flushing decisions are revisited.
+  // Make sure previous flushing decisions are revisited.
   isolate_->heap()->incremental_marking()->RecordWrites(shared_info);
 
   SharedFunctionInfo* candidate = shared_function_info_candidates_head_;
   SharedFunctionInfo* next_candidate;
   if (candidate == shared_info) {
     next_candidate = GetNextCandidate(shared_info);
     shared_function_info_candidates_head_ = next_candidate;
     ClearNextCandidate(shared_info);
   } else {
     while (candidate != NULL) {
       next_candidate = GetNextCandidate(candidate);
 
       if (next_candidate == shared_info) {
         next_candidate = GetNextCandidate(shared_info);
         SetNextCandidate(candidate, next_candidate);
         ClearNextCandidate(shared_info);
         break;
       }
 
       candidate = next_candidate;
     }
   }
 }
 
 
 void CodeFlusher::EvictCandidate(JSFunction* function) {
   ASSERT(!function->next_function_link()->IsUndefined());
   Object* undefined = isolate_->heap()->undefined_value();
 
-  // The function is no longer a candidate, make sure it gets visited
-  // again so that previous flushing decisions are revisited.
+  // Make sure previous flushing decisions are revisited.
   isolate_->heap()->incremental_marking()->RecordWrites(function);
+  isolate_->heap()->incremental_marking()->RecordWrites(function->shared());
 
   JSFunction* candidate = jsfunction_candidates_head_;
   JSFunction* next_candidate;
   if (candidate == function) {
     next_candidate = GetNextCandidate(function);
     jsfunction_candidates_head_ = next_candidate;
     ClearNextCandidate(function, undefined);
   } else {
     while (candidate != NULL) {
       next_candidate = GetNextCandidate(candidate);
@@ skipping 2858 matching lines @@
   while (buffer != NULL) {
     SlotsBuffer* next_buffer = buffer->next();
     DeallocateBuffer(buffer);
     buffer = next_buffer;
   }
   *buffer_address = NULL;
 }
 
 
 } }  // namespace v8::internal