[heap] Separate out optimized code map processing.

src/objects.cc

 // Copyright 2013 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/objects.h"
 
 #include <cmath>
 #include <iomanip>
 #include <sstream>
 
@@ skipping 11084 matching lines @@
     DCHECK(new_code_map->get(i + kContextOffset)->IsNativeContext());
     Object* code = new_code_map->get(i + kCachedCodeOffset);
     if (code != isolate->heap()->undefined_value()) {
       DCHECK(code->IsCode());
       DCHECK(Code::cast(code)->kind() == Code::OPTIMIZED_FUNCTION);
     }
     DCHECK(new_code_map->get(i + kLiteralsOffset)->IsFixedArray());
     DCHECK(new_code_map->get(i + kOsrAstIdOffset)->IsSmi());
   }
 #endif
+
+  if (Heap::ShouldZapGarbage()) {
+    // Zap any old optimized code map for heap-verifier.
+    if (!shared->optimized_code_map()->IsSmi()) {
+      FixedArray* old_code_map = FixedArray::cast(shared->optimized_code_map());
+      old_code_map->FillWithHoles(0, old_code_map->length());
+    }
+  }
+
   shared->set_optimized_code_map(*new_code_map);
 }
 
 
 void SharedFunctionInfo::ClearOptimizedCodeMap() {
-  FixedArray* code_map = FixedArray::cast(optimized_code_map());
-
-  // If the next map link slot is already used then the function was
-  // enqueued with code flushing and we remove it now.
-  if (!code_map->get(kNextMapIndex)->IsUndefined()) {
-    CodeFlusher* flusher = GetHeap()->mark_compact_collector()->code_flusher();
-    flusher->EvictOptimizedCodeMap(this);
+  if (Heap::ShouldZapGarbage()) {
+    // Zap any old optimized code map for heap-verifier.
+    if (!optimized_code_map()->IsSmi()) {
+      FixedArray* old_code_map = FixedArray::cast(optimized_code_map());
+      old_code_map->FillWithHoles(0, old_code_map->length());
+    }
   }
 
-  DCHECK(code_map->get(kNextMapIndex)->IsUndefined());
   set_optimized_code_map(Smi::FromInt(0));
 }
 
 
 void SharedFunctionInfo::EvictFromOptimizedCodeMap(Code* optimized_code,
                                                    const char* reason) {
   DisallowHeapAllocation no_gc;
   if (optimized_code_map()->IsSmi()) return;
 
   Heap* heap = GetHeap();
@@ skipping 6750 matching lines @@
   if (cell->value() != *new_value) {
     cell->set_value(*new_value);
     Isolate* isolate = cell->GetIsolate();
     cell->dependent_code()->DeoptimizeDependentCodeGroup(
         isolate, DependentCode::kPropertyCellChangedGroup);
   }
 }
 
 }  // namespace internal
 }  // namespace v8